Skip to content

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

换了点皮

parent 1895f54d
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 26 deletions
.idea/workspace.xml
View file @ 70a96fe6
......@@ -2,13 +2,46 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮">
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_0.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_9.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_0.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/target0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/target0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/target1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/target1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/target2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/target2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/target3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/target3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/target4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/target4.png" 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$/mock/miniTb/feile.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_disable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_disable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_enable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_enable_cur.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_enable_cur.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_star_disable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_disable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_star_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_enable.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/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -183,14 +216,7 @@
<workItem from="1617345199322" duration="4000" />
<workItem from="1617346486921" duration="1232000" />
<workItem from="1617348724978" duration="4857000" />
<workItem from="1617673451602" duration="10931000" />
</task>
<task id="LOCAL-00016" summary="m">
<created>1613703361421</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1613703361421</updated>
<workItem from="1617673451602" duration="16480000" />
</task>
<task id="LOCAL-00017" summary="m">
<created>1613703466149</created>
......@@ -528,7 +554,14 @@
<option name="project" value="LOCAL" />
<updated>1617691317354</updated>
</task>
<option name="localTasksCounter" value="65" />
<task id="LOCAL-00065" summary="换了点皮">
<created>1617691997838</created>
<option name="number" value="00065" />
<option name="presentableId" value="LOCAL-00065" />
<option name="project" value="LOCAL" />
<updated>1617691997838</updated>
</task>
<option name="localTasksCounter" value="66" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......
mock/miniTb/feile.getActivityBaseInfoById.json
View file @ 70a96fe6
{
"code": "000000",
"data": {
"currentLevel": 99,
"currentLevel": 90,
"topLevelVisitSuccess": true,
"isDrawTopLevelPrize": false,
"power": 10,
......
resource/map/map_check_disable.png
View replaced file @ 1895f54d View file @ 70a96fe6
resource/map/map_check_disable.png

20.7 KB | W: | H:

resource/map/map_check_disable.png

12.3 KB | W: | H:

resource/map/map_check_disable.png
resource/map/map_check_disable.png
resource/map/map_check_disable.png
resource/map/map_check_disable.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_check_enable.png
View replaced file @ 1895f54d View file @ 70a96fe6
resource/map/map_check_enable.png

14.9 KB | W: | H:

resource/map/map_check_enable.png

14.3 KB | W: | H:

resource/map/map_check_enable.png
resource/map/map_check_enable.png
resource/map/map_check_enable.png
resource/map/map_check_enable.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_check_enable_cur.png
View replaced file @ 1895f54d View file @ 70a96fe6
resource/map/map_check_enable_cur.png

14.9 KB | W: | H:

resource/map/map_check_enable_cur.png

14.3 KB | W: | H:

resource/map/map_check_enable_cur.png
resource/map/map_check_enable_cur.png
resource/map/map_check_enable_cur.png
resource/map/map_check_enable_cur.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_star_disable.png
View replaced file @ 1895f54d View file @ 70a96fe6
resource/map/map_star_disable.png

3.6 KB | W: | H:

resource/map/map_star_disable.png

1.45 KB | W: | H:

resource/map/map_star_disable.png
resource/map/map_star_disable.png
resource/map/map_star_disable.png
resource/map/map_star_disable.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_star_enable.png
View replaced file @ 1895f54d View file @ 70a96fe6
resource/map/map_star_enable.png

3.5 KB | W: | H:

resource/map/map_star_enable.png

1.43 KB | W: | H:

resource/map/map_star_enable.png
resource/map/map_star_enable.png
resource/map/map_star_enable.png
resource/map/map_star_enable.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 70a96fe6
......@@ -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_check_0.png,map_check_1.png,map_check_2.png,map_check_3.png,map_check_4.png,map_check_5.png,map_check_6.png,map_check_7.png,map_check_8.png,map_check_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": "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",
"name": "map"
},
{
......
src/ResJson.ts
View file @ 70a96fe6
......@@ -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_check_0.png,map_check_1.png,map_check_2.png,map_check_3.png,map_check_4.png,map_check_5.png,map_check_6.png,map_check_7.png,map_check_8.png,map_check_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": "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",
"name": "map"
},
{
......
src/scene/map/CheckBtn.ts
View file @ 70a96fe6
......@@ -37,6 +37,7 @@ export default class CheckBtn extends Container {
private btn: Button = null;
private checkTxt: BitmapText = null;
private checkTxt1: BitmapText = null;
private star: CheckStar[] = null;
......@@ -81,6 +82,7 @@ export default class CheckBtn extends Container {
this.btn.enabled = enabled;
this.star.forEach(v => v.visible = enabled);
this.checkTxt.visible = enabled;
this.checkTxt1.visible = !enabled;
}
// 按钮类型
......@@ -102,9 +104,9 @@ export default class CheckBtn extends Container {
RES.getRes('map_check_enable_cur.png'),
RES.getRes('map_check_enable_cur.png'),
RES.getRes('map_check_disable.png'));
const curAni = this.addChildAt(new Lottie(CheckTip), -1);
curAni.position.set(-72, -60);
curAni.play(-1);
// const curAni = this.addChildAt(new Lottie(CheckTip), -1);
// curAni.position.set(-72, -60);
// curAni.play(-1);
break;
}
}
......@@ -130,12 +132,12 @@ export default class CheckBtn extends Container {
// 三个星星
const star1 = this.addChild(new CheckStar());
star1.position.set(13, 107);
star1.position.set(10, 115);
star1.rotation = 10;
const star2 = this.addChild(new CheckStar());
star2.position.set(60, 112);
star2.position.set(57, 120);
const star3 = this.addChild(new CheckStar());
star3.position.set(105, 107);
star3.position.set(102, 115);
star3.rotation = -10;
this.star = [star1, star2, star3];
......@@ -143,10 +145,14 @@ export default class CheckBtn extends Container {
this.checkNum = data.check;
this.checkData.level = data.check;
this.checkTxt = this.btn.addChild(new BitmapText(Tools.getNumTextures('map_check_')));
this.checkTxt.position.set(79, 61);
this.checkTxt = this.btn.addChild(new BitmapText(Tools.getNumTextures('map_check2_')));
this.checkTxt.position.set(78, 38);
this.checkTxt.text = data.check + '';
this.checkTxt1 = this.btn.addChild(new BitmapText(Tools.getNumTextures('map_check1_')));
this.checkTxt1.position.set(78, 38);
this.checkTxt1.text = data.check + '';
this.enabled = false; // 先设置成关闭
// 点击事件
......
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