Commit 54e3074c authored by 邱旭's avatar 邱旭

换了点皮

parent 0e3b554b
......@@ -2,16 +2,36 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮">
<change afterPath="$PROJECT_DIR$/resource/map/checkTip1.png" 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$/resource/map/map_bg1.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg1.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_bg2.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg2.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_bg3.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg3.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/loadingScene/loadingBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/loadingScene/loadingBg.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/loadingScene/loadingPro.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/loadingScene/loadingPro.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/checkTip99.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/musicOff.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/musicOff.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/musicOn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/musicOn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/playBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/playBg.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/starProgress.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/starProgress.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/topBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/topBg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/闪闪.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/闪闪.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum关.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum关.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum第.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum第.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" 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/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.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/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapBottom.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapBottom.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/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapTop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapTop.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/ScoreProgress.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/ScoreProgress.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -152,8 +172,8 @@
</list>
<recent_temporary>
<list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" />
</list>
......@@ -187,14 +207,7 @@
<workItem from="1617346486921" duration="1232000" />
<workItem from="1617348724978" duration="4857000" />
<workItem from="1617673451602" duration="17243000" />
<workItem from="1617702978246" duration="4620000" />
</task>
<task id="LOCAL-00018" summary="m">
<created>1613706401083</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1613706401083</updated>
<workItem from="1617702978246" duration="10156000" />
</task>
<task id="LOCAL-00019" summary="m">
<created>1613706865023</created>
......@@ -532,7 +545,14 @@
<option name="project" value="LOCAL" />
<updated>1617700390266</updated>
</task>
<option name="localTasksCounter" value="67" />
<task id="LOCAL-00067" summary="换了点皮">
<created>1617762149459</created>
<option name="number" value="00067" />
<option name="presentableId" value="LOCAL-00067" />
<option name="project" value="LOCAL" />
<updated>1617762149460</updated>
</task>
<option name="localTasksCounter" value="68" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......
{
"code": "000000",
"data": {
"currentLevel": 99,
"currentLevel": 1,
"topLevelVisitSuccess": true,
"isDrawTopLevelPrize": false,
"power": 10,
......
resource/loadingScene/loadingPro.png

8.23 KB | W: | H:

resource/loadingScene/loadingPro.png

6.99 KB | W: | H:

resource/loadingScene/loadingPro.png
resource/loadingScene/loadingPro.png
resource/loadingScene/loadingPro.png
resource/loadingScene/loadingPro.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/musicOff.png

5.65 KB | W: | H:

resource/playScene/musicOff.png

5.62 KB | W: | H:

resource/playScene/musicOff.png
resource/playScene/musicOff.png
resource/playScene/musicOff.png
resource/playScene/musicOff.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/musicOn.png

5.33 KB | W: | H:

resource/playScene/musicOn.png

5.26 KB | W: | H:

resource/playScene/musicOn.png
resource/playScene/musicOn.png
resource/playScene/musicOn.png
resource/playScene/musicOn.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/starProgress.png

7.45 KB | W: | H:

resource/playScene/starProgress.png

8.46 KB | W: | H:

resource/playScene/starProgress.png
resource/playScene/starProgress.png
resource/playScene/starProgress.png
resource/playScene/starProgress.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/topBg.png

21.6 KB | W: | H:

resource/playScene/topBg.png

7.67 KB | W: | H:

resource/playScene/topBg.png
resource/playScene/topBg.png
resource/playScene/topBg.png
resource/playScene/topBg.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/闪闪.png

2.03 KB | W: | H:

resource/playScene/闪闪.png

2.05 KB | W: | H:

resource/playScene/闪闪.png
resource/playScene/闪闪.png
resource/playScene/闪闪.png
resource/playScene/闪闪.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum0.png

411 Bytes | W: | H:

resource/playSceneNum/chapterNum0.png

180 Bytes | W: | H:

resource/playSceneNum/chapterNum0.png
resource/playSceneNum/chapterNum0.png
resource/playSceneNum/chapterNum0.png
resource/playSceneNum/chapterNum0.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum1.png

164 Bytes | W: | H:

resource/playSceneNum/chapterNum1.png

111 Bytes | W: | H:

resource/playSceneNum/chapterNum1.png
resource/playSceneNum/chapterNum1.png
resource/playSceneNum/chapterNum1.png
resource/playSceneNum/chapterNum1.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum2.png

345 Bytes | W: | H:

resource/playSceneNum/chapterNum2.png

185 Bytes | W: | H:

resource/playSceneNum/chapterNum2.png
resource/playSceneNum/chapterNum2.png
resource/playSceneNum/chapterNum2.png
resource/playSceneNum/chapterNum2.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum3.png

359 Bytes | W: | H:

resource/playSceneNum/chapterNum3.png

191 Bytes | W: | H:

resource/playSceneNum/chapterNum3.png
resource/playSceneNum/chapterNum3.png
resource/playSceneNum/chapterNum3.png
resource/playSceneNum/chapterNum3.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum4.png

298 Bytes | W: | H:

resource/playSceneNum/chapterNum4.png

173 Bytes | W: | H:

resource/playSceneNum/chapterNum4.png
resource/playSceneNum/chapterNum4.png
resource/playSceneNum/chapterNum4.png
resource/playSceneNum/chapterNum4.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum5.png

345 Bytes | W: | H:

resource/playSceneNum/chapterNum5.png

183 Bytes | W: | H:

resource/playSceneNum/chapterNum5.png
resource/playSceneNum/chapterNum5.png
resource/playSceneNum/chapterNum5.png
resource/playSceneNum/chapterNum5.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum6.png

435 Bytes | W: | H:

resource/playSceneNum/chapterNum6.png

204 Bytes | W: | H:

resource/playSceneNum/chapterNum6.png
resource/playSceneNum/chapterNum6.png
resource/playSceneNum/chapterNum6.png
resource/playSceneNum/chapterNum6.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum7.png

298 Bytes | W: | H:

resource/playSceneNum/chapterNum7.png

175 Bytes | W: | H:

resource/playSceneNum/chapterNum7.png
resource/playSceneNum/chapterNum7.png
resource/playSceneNum/chapterNum7.png
resource/playSceneNum/chapterNum7.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum8.png

499 Bytes | W: | H:

resource/playSceneNum/chapterNum8.png

212 Bytes | W: | H:

resource/playSceneNum/chapterNum8.png
resource/playSceneNum/chapterNum8.png
resource/playSceneNum/chapterNum8.png
resource/playSceneNum/chapterNum8.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum9.png

432 Bytes | W: | H:

resource/playSceneNum/chapterNum9.png

206 Bytes | W: | H:

resource/playSceneNum/chapterNum9.png
resource/playSceneNum/chapterNum9.png
resource/playSceneNum/chapterNum9.png
resource/playSceneNum/chapterNum9.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum关.png

632 Bytes | W: | H:

resource/playSceneNum/chapterNum关.png

286 Bytes | W: | H:

resource/playSceneNum/chapterNum关.png
resource/playSceneNum/chapterNum关.png
resource/playSceneNum/chapterNum关.png
resource/playSceneNum/chapterNum关.png
  • 2-up
  • Swipe
  • Onion skin
resource/playSceneNum/chapterNum第.png

678 Bytes | W: | H:

resource/playSceneNum/chapterNum第.png

281 Bytes | W: | H:

resource/playSceneNum/chapterNum第.png
resource/playSceneNum/chapterNum第.png
resource/playSceneNum/chapterNum第.png
resource/playSceneNum/chapterNum第.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -73,7 +73,7 @@
"name": "lotteryScene"
},
{
"keys": "checkTip99.png,clearanceBtn.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check1_0.png,map_check1_1.png,map_check1_2.png,map_check1_3.png,map_check1_4.png,map_check1_5.png,map_check1_6.png,map_check1_7.png,map_check1_8.png,map_check1_9.png,map_check2_0.png,map_check2_1.png,map_check2_2.png,map_check2_3.png,map_check2_4.png,map_check2_5.png,map_check2_6.png,map_check2_7.png,map_check2_8.png,map_check2_9.png,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png",
"keys": "checkTip1.png,clearanceBtn.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check1_0.png,map_check1_1.png,map_check1_2.png,map_check1_3.png,map_check1_4.png,map_check1_5.png,map_check1_6.png,map_check1_7.png,map_check1_8.png,map_check1_9.png,map_check2_0.png,map_check2_1.png,map_check2_2.png,map_check2_3.png,map_check2_4.png,map_check2_5.png,map_check2_6.png,map_check2_7.png,map_check2_8.png,map_check2_9.png,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png",
"name": "map"
},
{
......
......@@ -73,7 +73,7 @@ export const ResJson = {
"name": "lotteryScene"
},
{
"keys": "checkTip99.png,clearanceBtn.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check1_0.png,map_check1_1.png,map_check1_2.png,map_check1_3.png,map_check1_4.png,map_check1_5.png,map_check1_6.png,map_check1_7.png,map_check1_8.png,map_check1_9.png,map_check2_0.png,map_check2_1.png,map_check2_2.png,map_check2_3.png,map_check2_4.png,map_check2_5.png,map_check2_6.png,map_check2_7.png,map_check2_8.png,map_check2_9.png,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png",
"keys": "checkTip1.png,clearanceBtn.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check1_0.png,map_check1_1.png,map_check1_2.png,map_check1_3.png,map_check1_4.png,map_check1_5.png,map_check1_6.png,map_check1_7.png,map_check1_8.png,map_check1_9.png,map_check2_0.png,map_check2_1.png,map_check2_2.png,map_check2_3.png,map_check2_4.png,map_check2_5.png,map_check2_6.png,map_check2_7.png,map_check2_8.png,map_check2_9.png,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png",
"name": "map"
},
{
......
......@@ -27,7 +27,7 @@ export class LoadingScene extends Scene {
//进度条帧动画
const pro = this.addChild(Tools.getSprite('loadingPro.png'));
pro.position.set(126, 526)//位置按正常满条的位置
pro.position.set(126, 792)//位置按正常满条的位置
//@ts-ignore 进度条托管
this.progressBar = new ProgressBarS(pro);
......
......@@ -260,7 +260,7 @@ export class PlayScene extends Scene {
this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers.stageOffsetY);
//排版
//底部背景
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, 10);
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, 107);
const commonTextArr = {};
for (let i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png");
......@@ -381,7 +381,7 @@ export class PlayScene extends Scene {
this.steps = this.chapterData.stepCount;
//分数进度条,托管
this.scoreProgress = this.addChild(new ScoreProgress(this.chapterData.starScores));
this.scoreProgress.position.set(86, 275);
this.scoreProgress.position.set(83, 272);
//分数置0
this.score = 0;
//地图生成
......
......@@ -158,8 +158,8 @@ export default class CheckBtn extends Container {
// 点击事件
this.btn.addEventListener(MouseEvent.CLICK, this.clickStart, this);
if (data.check == Tools.maxLevel) {
this.addChild(Tools.getSprite("checkTip99.png", -34, -62));
if (data.check == 1) {
this.addChild(Tools.getSprite("checkTip1.png", -48, -72));
}
}
......
......@@ -25,7 +25,7 @@ export class ScoreProgress extends FYGE.Container {
287.5,
407.5,
526.5,
563
569
]
private _score: number;
......@@ -85,7 +85,7 @@ export class ScoreProgress extends FYGE.Container {
const mask = this.starProgress.mask;
mask.clear();
mask.beginFill(0xff0000, 1);
mask.drawRoundedRect(0, 0, w, 43, 43);
mask.drawRoundedRect(0, 0, w, 50, 50);
mask.endFill();
}
......@@ -108,7 +108,7 @@ export class ScoreProgress extends FYGE.Container {
//加遮罩,加到starProgress的父级中
const mask = new FYGE.Shape();
mask.beginFill(0xff0000, 1);
mask.drawRoundedRect(0, 0, 0, 43, 43);
mask.drawRoundedRect(0, 0, 0, 50, 50);
mask.endFill();
this.starProgress.mask = mask;
this.addChild(mask);
......
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