Skip to content

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

换了点皮

parent e62fed5e
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 34 deletions
.idea/workspace.xml
View file @ a766a091
......@@ -3,11 +3,17 @@
<component name="ChangeListManager">
<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$/resource/playScene/amazing.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/amazing.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/good.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/good.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/great.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/great.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/perfect.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/perfect.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropGuide.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/playSceneGuide/gameGuideBoard.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuideBoard.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_5_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_5_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_8_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_8_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneGuide/guidePropHand.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropHand.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playSceneGuide/propGuideBoard.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneGuide/propGuideBoard.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/FirstPropGift.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/FirstPropGift.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -201,14 +207,7 @@
<workItem from="1617871191619" duration="121000" />
<workItem from="1617890665920" duration="181000" />
<workItem from="1617960804439" duration="639000" />
<workItem from="1618193237335" duration="10481000" />
</task>
<task id="LOCAL-00039" summary="m">
<created>1613961568453</created>
<option name="number" value="00039" />
<option name="presentableId" value="LOCAL-00039" />
<option name="project" value="LOCAL" />
<updated>1613961568453</updated>
<workItem from="1618193237335" duration="12118000" />
</task>
<task id="LOCAL-00040" summary="m">
<created>1614045699247</created>
......@@ -546,7 +545,14 @@
<option name="project" value="LOCAL" />
<updated>1618208999980</updated>
</task>
<option name="localTasksCounter" value="88" />
<task id="LOCAL-00088" summary="换了点皮">
<created>1618209221940</created>
<option name="number" value="00088" />
<option name="presentableId" value="LOCAL-00088" />
<option name="project" value="LOCAL" />
<updated>1618209221940</updated>
</task>
<option name="localTasksCounter" value="89" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......
mock/miniTb/feile.getActivityBaseInfoById.json
View file @ a766a091
{
"code": "000000",
"data": {
"currentLevel": 99,
"currentLevel": 61,
"topLevelVisitSuccess": true,
"isDrawTopLevelPrize": false,
"power": 10,
......
src/something/uis/FirstPropGift.ts
View file @ a766a091
......@@ -13,12 +13,12 @@ export class FirstPropGift extends FYGE.Container {
bg.hitTestByPixel = false;
//信息板
var msgBoard = this.addChild(Tools.getSprite('propGuideBoard.png'));
msgBoard.position.set((750 - 604) / 2, 800);
msgBoard.position.set((750 - 604) / 2, 440);
// msgBoard.msg = "首次进入游戏，送你三个道具，让你通关无阻力！";
//三个道具
["stepBtn", "boomBtn", "hammerBtn"].forEach((e, i) => {
this.addChild(FYGE.Sprite.fromFrame(e + ".png"))
.position.set(100 + i * 230, 500)
})
// //三个道具
// ["stepBtn", "boomBtn", "hammerBtn"].forEach((e, i) => {
// this.addChild(FYGE.Sprite.fromFrame(e + ".png"))
// .position.set(100 + i * 230, 500)
// })
}
}
src/something/uis/GameGuide.ts
View file @ a766a091
......@@ -144,12 +144,12 @@ export class MsgBoard extends FYGE.Sprite {
super(RES.getRes("gameGuideBoard.png"));
const msg = this.addChild(Tools.getText(
"",
30,
"#744f1d",
28,
"#000000",
FYGE.TEXT_ALIGN.LEFT,
330,
158,
20
-14
));
msg.textHeight = 166;
msg.verticalAlign = FYGE.VERTICAL_ALIGN.MIDDLE;
......@@ -177,7 +177,7 @@ const chapterFuns = {
],
//提示文案，尽量通用点的位置。x肯定都居中
msg: [
"3个同色猫头成一排即可消除~"
"3个同色元素成一排即可消除~"
],
img: [
'gameGuide_1.png'
......@@ -196,7 +196,7 @@ const chapterFuns = {
[21, 20]
],
msg: [
"消除冰块上的猫头即可打破冰块"
"消除冰块上的元素即可打破冰块"
]
},
//石头消除
......@@ -212,7 +212,7 @@ const chapterFuns = {
[12, 13]
],
msg: [
"当石头附近的猫头产生消除时，即可粉碎石头"
"当石头附近的元素产生消除时，即可粉碎石头"
]
},
//直线特效
......@@ -231,7 +231,7 @@ const chapterFuns = {
[49, 50]
],
msg: [
"4个同样的猫头形成直线就能合成直线特效",
"4个同样的元素形成直线就能合成直线特效",
"消除直线特效会产生直线消除"
],
img: [
......@@ -258,7 +258,7 @@ const chapterFuns = {
[30, 29]
],
msg: [
"5个同样的猫头成L形或T形就能合成爆炸特效",
"5个同样的元素成L形或T形就能合成爆炸特效",
"消除爆炸特效会产生3*3的范围消除",
],
img: [
......@@ -301,7 +301,7 @@ const chapterFuns = {
[73, 64]
],
msg: [
"五个同样的猫头形成一字型即可合成魔力花特效",
"五个同样的元素形成一字型即可合成魔力花特效",
"拖动魔力花特效即可直接触发"
],
dp: [
......@@ -342,7 +342,7 @@ const chapterFuns = {
],
msg: [
"当棒棒糖移至底层时，即可移除棒棒糖",
"消除棒棒糖下方的猫头\n就可以收集棒棒糖啦"
"消除棒棒糖下方的元素\n就可以收集棒棒糖啦"
],
dp: [
[0, 0],
......@@ -362,7 +362,7 @@ const chapterFuns = {
[3, 2]
],
msg: [
"和困住藤蔓里的猫头匹配消除，就可以打破藤蔓啦！"
"和困住藤蔓里的元素匹配消除，就可以打破藤蔓啦！"
]
},
//果冻消除
......@@ -378,7 +378,7 @@ const chapterFuns = {
[40, 49]
],
msg: [
"小心！会蔓延的毛线球！\n消除毛线球旁边的猫头\n就能消除毛线球~"
"小心！会蔓延的毛线球！\n消除毛线球旁边的元素\n就能消除毛线球~"
]
},
//鸡蛋
......@@ -394,7 +394,7 @@ const chapterFuns = {
[66, 57]
],
msg: [
"蛋蛋边上不断有猫猫消除时，会开出惊喜哦"
"蛋蛋边上不断有元素消除时，会开出惊喜哦"
],
dp: [
[-70, -770],
......
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