Skip to content

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

m

parent 6a5c45d3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 29 deletions
.idea/workspace.xml
View file @ 665d2d24
......@@ -2,8 +2,15 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/resource/StartPanel/startNum0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/GameGuide.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$/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$/resource/loadingScene/loadingBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/loadingScene/loadingBg.jpg" 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/something/class/Element.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/class/Element.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -116,9 +123,9 @@
<recent_temporary>
<list>
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.copyJs" />
</list>
</recent_temporary>
......@@ -134,7 +141,7 @@
<workItem from="1612576979459" duration="13000" />
<workItem from="1612577003915" duration="21094000" />
<workItem from="1612662929222" duration="40609000" />
<workItem from="1613698993022" duration="18473000" />
<workItem from="1613698993022" duration="22073000" />
</task>
<task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created>
......@@ -297,7 +304,14 @@
<option name="project" value="LOCAL" />
<updated>1613719810975</updated>
</task>
<option name="localTasksCounter" value="24" />
<task id="LOCAL-00024" summary="m">
<created>1613727027414</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1613727027414</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......
mock/miniTb/feile.getActivityBaseInfoById.json
View file @ 665d2d24
{
"code": "000000",
"data": {
"currentLevel": 99,
"currentLevel": 1,
"topLevelVisitSuccess": true,
"isDrawTopLevelPrize": false,
"power": 10,
......
output.js
View file @ 665d2d24
......@@ -2070,7 +2070,7 @@ exports.ResJson = {
}
},
{
"keys": "startBg.png,startBtn.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"keys": "startBg.png,startBtn.png,startNum0.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"name": "StartPanel",
"atlas": {
"startBg.png": {
......@@ -2095,9 +2095,20 @@ exports.ResJson = {
"sh": 126,
"ro": false
},
"startNum1.png": {
"startNum0.png": {
"x": 496,
"y": 599,
"w": 26,
"h": 39,
"ox": 0,
"oy": 4,
"sw": 26,
"sh": 47,
"ro": false
},
"startNum1.png": {
"x": 497,
"y": 681,
"w": 25,
"h": 39,
"ox": 0,
......@@ -7655,7 +7666,7 @@ exports.ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1613703486/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1613728610/resource/"
};
......@@ -24176,6 +24187,10 @@ var Element = (function (_super) {
_this.temEffectType = null;
_this._effectType = null;
_this.states = [];
_this.moveCount = 0;
_this.moveDir = 1;
_this.moveFrame = 0;
_this.moveFrameSign = 6;
_this._type = type;
_this.changeSource();
if (type == ElementType_1.ElementType.CHICKEN_EGG) {
......@@ -24269,6 +24284,26 @@ var Element = (function (_super) {
enumerable: false,
configurable: true
});
Element.prototype.update = function () {
_super.prototype.update.call(this);
if (this._effectType == EffectType_1.EffectType.HORIZONTAL
|| this._effectType == EffectType_1.EffectType.VERTICAL) {
this.moveFrame++;
if (this.moveFrame > this.moveFrameSign) {
this.moveFrame = 0;
this.moveCount += this.moveDir;
}
if (this._effectType == EffectType_1.EffectType.HORIZONTAL) {
this.x += this.moveDir / this.moveFrameSign;
}
else if (this._effectType == EffectType_1.EffectType.VERTICAL) {
this.y += this.moveDir / this.moveFrameSign;
}
if (Math.abs(this.moveCount) >= 3) {
this.moveDir *= -1;
}
}
};
Element.prototype.changeSource = function () {
var texArr;
if (this._effectType == null) {
......@@ -27255,7 +27290,7 @@ var chapterFuns = {
[58, 67]
],
msg: [
"3个同色猫头像成一排即可消除~"
"3个同色猫头成一排即可消除~"
],
img: [
'gameGuide_1.png'
......@@ -27273,7 +27308,7 @@ var chapterFuns = {
[21, 20]
],
msg: [
"消除冰块上的猫头像即可打破冰块"
"消除冰块上的猫头即可打破冰块"
]
},
3: {
......@@ -27288,7 +27323,7 @@ var chapterFuns = {
[12, 13]
],
msg: [
"当石头附近的猫头像产生消除时，即可粉碎石头"
"当石头附近的猫头产生消除时，即可粉碎石头"
]
},
5: {
......@@ -27306,7 +27341,7 @@ var chapterFuns = {
[49, 50]
],
msg: [
"4个同样的猫头像形成直线就能合成直线特效",
"4个同样的猫头形成直线就能合成直线特效",
"消除直线特效会产生直线消除"
],
img: [
......@@ -27332,7 +27367,7 @@ var chapterFuns = {
[30, 29]
],
msg: [
"5个同样的猫头像成L形或T形就能合成爆炸特效",
"5个同样的猫头成L形或T形就能合成爆炸特效",
"消除爆炸特效会产生3*3的范围消除",
],
img: [
......@@ -27373,7 +27408,7 @@ var chapterFuns = {
[73, 64]
],
msg: [
"五个同样的猫头像形成一字型即可合成魔力花特效",
"五个同样的猫头形成一字型即可合成魔力花特效",
"拖动魔力花特效即可直接触发"
],
dp: [
......@@ -27412,7 +27447,7 @@ var chapterFuns = {
],
msg: [
"当棒棒糖移至底层时，即可移除棒棒糖",
"消除棒棒糖下方的猫头像\n就可以收集棒棒糖啦"
"消除棒棒糖下方的猫头\n就可以收集棒棒糖啦"
],
dp: [
[0, 0],
......@@ -27431,7 +27466,7 @@ var chapterFuns = {
[3, 2]
],
msg: [
"和困住藤蔓里的猫头像匹配\n消除，就可以打破藤蔓啦！"
"和困住藤蔓里的猫头匹配消除，就可以打破藤蔓啦！"
]
},
41: {
......@@ -27446,7 +27481,7 @@ var chapterFuns = {
[40, 49]
],
msg: [
"小心！会蔓延的毛线球！\n消除毛线球旁边的猫头像\n就能消除毛线球~"
"小心！会蔓延的毛线球！\n消除毛线球旁边的猫头\n就能消除毛线球~"
]
},
61: {
output.js.map
View file @ 665d2d24
This diff is collapsed.
resource/res.json
View file @ 665d2d24
......@@ -29,7 +29,7 @@
"name": "RulePanel"
},
{
"keys": "startBg.png,startBtn.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"keys": "startBg.png,startBtn.png,startNum0.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"name": "StartPanel"
},
{
......
src/ResJson.ts
View file @ 665d2d24
......@@ -197,7 +197,7 @@ export const ResJson = {
}
},
{
"keys": "startBg.png,startBtn.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"keys": "startBg.png,startBtn.png,startNum0.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"name": "StartPanel",
"atlas": {
"startBg.png": {
......@@ -222,9 +222,20 @@ export const ResJson = {
"sh": 126,
"ro": false
},
"startNum1.png": {
"startNum0.png": {
"x": 496,
"y": 599,
"w": 26,
"h": 39,
"ox": 0,
"oy": 4,
"sw": 26,
"sh": 47,
"ro": false
},
"startNum1.png": {
"x": 497,
"y": 681,
"w": 25,
"h": 39,
"ox": 0,
......@@ -5782,5 +5793,5 @@ export const ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1613703486/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1613728610/resource/"
}
\ No newline at end of file
src/something/class/Element.ts
View file @ 665d2d24
......@@ -8,13 +8,7 @@ import { VerticalBgAni } from "../periodAni/VerticalBgAni";
import { ExplosiveBgAni } from "../periodAni/ExplosiveBgAni";
import { ChickenEgg } from "./ChickenEgg";
import { State } from "./State";
import { StateType, stateDatas } from "../enum/StateType";
import { LockState } from "../states/LockState";
import { HairballBrownState } from "../states/HairballBrownState";
import { BubbleState } from "../states/BubbleState";
import { HairballGreyState } from "../states/HairballGreyState";
import { HairballBlackState } from "../states/HairballBlackState";
import { stateDatas, StateType } from "../enum/StateType";
import { Tool } from "../Tool";
import { FestivalEle } from "./FestivalEle";
import { RES } from "../../../module/RES";
......@@ -162,6 +156,35 @@ export class Element extends FYGE.Container {
}
moveCount = 0; // 移动计数
moveDir = 1; // 移动计数
moveFrame = 0; // 移动了几帧
moveFrameSign = 6; // 要几帧
update() {
super.update();
if (
this._effectType == EffectType.HORIZONTAL
|| this._effectType == EffectType.VERTICAL
) {
this.moveFrame++;
if (this.moveFrame > this.moveFrameSign) {
this.moveFrame = 0;
this.moveCount += this.moveDir;
}
if (this._effectType == EffectType.HORIZONTAL) {
this.x += this.moveDir / this.moveFrameSign;
} else if (this._effectType == EffectType.VERTICAL) {
this.y += this.moveDir / this.moveFrameSign;
}
if (Math.abs(this.moveCount) >= 3) {
this.moveDir *= -1;
}
}
}
/**
* 类型和特效类型得提前赋值
* 暂时为，修改贴图
......
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