Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
babycare_xiaoxiao
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
翁阳
babycare_xiaoxiao
Commits
07a667a8
Commit
07a667a8
authored
Sep 28, 2020
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
主页
parent
5fd9d915
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
146 additions
and
49 deletions
+146
-49
workspace.xml
.idea/workspace.xml
+35
-43
圆圈.png
resource/FreePowerPanel/圆圈.png
+0
-0
开心收下.png
resource/FreePowerPanel/开心收下.png
+0
-0
res.json
resource/res.json
+6
-2
ResJson.ts
src/ResJson.ts
+6
-2
FesRedPrizePanel.ts
src/panels/FesRedPrizePanel.ts
+76
-0
PlayScene.ts
src/scene/PlayScene.ts
+17
-0
MapScene.ts
src/scene/map/MapScene.ts
+3
-0
FestivalEle.ts
src/something/class/FestivalEle.ts
+3
-2
No files found.
.idea/workspace.xml
View file @
07a667a8
This diff is collapsed.
Click to expand it.
resource/FreePowerPanel/圆圈.png
View replaced file @
5fd9d915
View file @
07a667a8
127 KB
|
W:
|
H:
120 KB
|
W:
|
H:
2-up
Swipe
Onion skin
resource/FreePowerPanel/开心收下.png
deleted
100644 → 0
View file @
5fd9d915
28.6 KB
resource/res.json
View file @
07a667a8
...
@@ -5,7 +5,11 @@
...
@@ -5,7 +5,11 @@
"name"
:
"FailedPanel"
"name"
:
"FailedPanel"
},
},
{
{
"keys"
:
"圆圈.png,开心收下.png"
,
"keys"
:
"FesRedPrizeBg.png"
,
"name"
:
"FesRedPrizePanel"
},
{
"keys"
:
"圆圈.png"
,
"name"
:
"FreePowerPanel"
"name"
:
"FreePowerPanel"
},
},
{
{
...
@@ -45,7 +49,7 @@
...
@@ -45,7 +49,7 @@
"name"
:
"bonusTime"
"name"
:
"bonusTime"
},
},
{
{
"keys"
:
"boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png"
,
"keys"
:
"boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,
开心收下.png,
确定.png,继续闯关大.png,继续闯关小.png"
,
"name"
:
"common"
"name"
:
"common"
},
},
{
{
...
...
src/ResJson.ts
View file @
07a667a8
...
@@ -5,7 +5,11 @@ export const ResJson = {
...
@@ -5,7 +5,11 @@ export const ResJson = {
"name"
:
"FailedPanel"
"name"
:
"FailedPanel"
},
},
{
{
"keys"
:
"圆圈.png,开心收下.png"
,
"keys"
:
"FesRedPrizeBg.png"
,
"name"
:
"FesRedPrizePanel"
},
{
"keys"
:
"圆圈.png"
,
"name"
:
"FreePowerPanel"
"name"
:
"FreePowerPanel"
},
},
{
{
...
@@ -45,7 +49,7 @@ export const ResJson = {
...
@@ -45,7 +49,7 @@ export const ResJson = {
"name"
:
"bonusTime"
"name"
:
"bonusTime"
},
},
{
{
"keys"
:
"boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png"
,
"keys"
:
"boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,
开心收下.png,
确定.png,继续闯关大.png,继续闯关小.png"
,
"name"
:
"common"
"name"
:
"common"
},
},
{
{
...
...
src/panels/FesRedPrizePanel.ts
0 → 100644
View file @
07a667a8
import
{
Panel
}
from
"../../module/views/Panel"
;
import
Tween
=
FYGE
.
Tween
;
import
Ease
=
FYGE
.
Ease
;
import
Sprite
=
FYGE
.
Sprite
;
import
{
PropType
}
from
"../something/enum/PropType"
;
import
{
RES
}
from
"../../module/RES"
;
import
{
changeScene
}
from
"../../module/ctrls"
;
import
{
MapScene
}
from
"../scene/map/MapScene"
;
import
MouseEvent
=
FYGE
.
MouseEvent
;
import
Button
=
FYGE
.
Button
;
import
{
Tools
}
from
"../Tools"
;
const
propImg
=
{
[
PropType
.
BOOMS
]:
'boomBtn.png'
,
[
PropType
.
HAMMERS
]:
'hammerBtn.png'
,
[
PropType
.
STEPS
]:
'stepBtn.png'
}
export
class
FesRedPrizePanel
extends
Panel
{
get
groupNames
()
{
return
[
'FesRedPrizePanel'
]
}
// get skinName() {
// return "SuccessPrizePanel"
// }
public
showAni
()
{
if
(
this
.
isShowing
)
return
;
this
.
isShowing
=
true
;
this
.
anchor
.
set
(
375
,
812
);
Tween
.
get
(
this
)
.
set
({
scaleX
:
0
,
scaleY
:
0
})
.
to
({
scaleX
:
1
,
scaleY
:
1
},
400
,
Ease
.
backOut
)
.
call
(()
=>
{
this
.
isShowing
=
false
;
});
}
closeBtn
:
FYGE
.
Button
;
btn
:
Button
;
img
:
Sprite
;
initUi
()
{
// const {stars, tool, prize} = this.data;
this
.
addChild
(
Tools
.
getSprite
(
'FesRedPrizeBg.png'
))
.
position
.
set
(
53
,
209
);
this
.
addChild
(
new
Button
(
RES
.
getRes
(
'关闭按钮.png'
)))
.
addEventListener
(
MouseEvent
.
CLICK
,
this
.
hidePanel
,
this
)
.
position
.
set
(
625
,
431
);
this
.
addChild
(
new
Button
(
RES
.
getRes
(
'开心收下.png'
)))
.
addEventListener
(
MouseEvent
.
CLICK
,
this
.
hidePanel
,
this
)
.
position
.
set
(
165
,
1045
);
this
.
img
=
this
.
addChild
(
new
Sprite
());
this
.
img
.
anchorTexture
.
x
=
0.5
;
this
.
img
.
position
.
set
(
375
,
693
);
this
.
img
.
width
=
this
.
img
.
height
=
252
;
}
start
(
data
)
{
super
.
start
();
}
initEvents
()
{
super
.
initEvents
();
}
removeEvents
()
{
super
.
removeEvents
();
}
}
src/scene/PlayScene.ts
View file @
07a667a8
...
@@ -64,6 +64,7 @@ import { FirstPropGift } from '../something/uis/FirstPropGift';
...
@@ -64,6 +64,7 @@ import { FirstPropGift } from '../something/uis/FirstPropGift';
import
{
bonus_lottie
}
from
'../lotties/bonus_lottie'
;
import
{
bonus_lottie
}
from
'../lotties/bonus_lottie'
;
import
{
GDispatcher
}
from
'../Main'
;
import
{
GDispatcher
}
from
'../Main'
;
import
{
G_EVENT
}
from
'../common/G_EVENT'
;
import
{
G_EVENT
}
from
'../common/G_EVENT'
;
import
{
FestivalEle
}
from
"../something/class/FestivalEle"
;
const
aniClass
=
{
const
aniClass
=
{
"BoomAni"
:
BoomAni
,
"BoomAni"
:
BoomAni
,
...
@@ -759,6 +760,7 @@ export class PlayScene extends Scene {
...
@@ -759,6 +760,7 @@ export class PlayScene extends Scene {
this
.
festivalTarget
.
x
=
580
;
this
.
festivalTarget
.
x
=
580
;
this
.
festivalTarget
.
y
=
115
;
this
.
festivalTarget
.
y
=
115
;
this
.
addChildAt
(
this
.
festivalTarget
,
1
);
this
.
addChildAt
(
this
.
festivalTarget
,
1
);
this
.
festivalTarget
.
visible
=
false
;
if
(
this
.
lattices
[
festivalIndex
].
element
)
{
if
(
this
.
lattices
[
festivalIndex
].
element
)
{
this
.
lattices
[
festivalIndex
].
element
.
reset
(
ElementType
.
FESTIVALELE_BIG
)
this
.
lattices
[
festivalIndex
].
element
.
reset
(
ElementType
.
FESTIVALELE_BIG
)
}
else
{
}
else
{
...
@@ -2828,13 +2830,28 @@ export class PlayScene extends Scene {
...
@@ -2828,13 +2830,28 @@ export class PlayScene extends Scene {
//查看次数,原先不为0,
//查看次数,原先不为0,
if
(
this
.
festivalTargetNum
)
{
if
(
this
.
festivalTargetNum
)
{
this
.
festivalTargetNum
--
;
this
.
festivalTargetNum
--
;
// this.festivalTarget.count--;
//@ts-ignore
//@ts-ignore
var
p
=
this
.
festivalTarget
.
localToGlobal
({
x
:
40
*
0.8
,
y
:
40
*
0.8
})
var
p
=
this
.
festivalTarget
.
localToGlobal
({
x
:
40
*
0.8
,
y
:
40
*
0.8
})
this
.
addChild
(
FlyTargetAni
(
ElementType
.
FESTIVALELE_SMALL
,
[
ele
.
x
,
ele
.
y
],
[
p
.
x
,
p
.
y
],
()
=>
{
this
.
addChild
(
FlyTargetAni
(
ElementType
.
FESTIVALELE_SMALL
,
[
ele
.
x
,
ele
.
y
],
[
p
.
x
,
p
.
y
],
()
=>
{
this
.
festivalTarget
.
count
--
;
this
.
festivalTarget
.
count
--
;
}))
}))
// this.addChild(
// EleMaskAni(
// ele,
// [ele.x, ele.y],
// 0,
// this,
// false,
// 1000,
// () => {
// this.festivalTarget.count--;
// }))
//完成了,发接口,到时需要修改,对于接口没成功的不设置
//完成了,发接口,到时需要修改,对于接口没成功的不设置
if
(
!
this
.
festivalTargetNum
)
{
if
(
!
this
.
festivalTargetNum
)
{
console
.
log
(
'红包全都消除完了'
);
// NetManager.ins.hc_redBombAward((success) => {
// NetManager.ins.hc_redBombAward((success) => {
// if (success) this.redBombPanelMark = true;
// if (success) this.redBombPanelMark = true;
// });
// });
...
...
src/scene/map/MapScene.ts
View file @
07a667a8
...
@@ -15,6 +15,7 @@ import Tween = FYGE.Tween;
...
@@ -15,6 +15,7 @@ import Tween = FYGE.Tween;
import
Ease
=
FYGE
.
Ease
;
import
Ease
=
FYGE
.
Ease
;
import
{
showPanel
}
from
"../../../module/ctrls"
;
import
{
showPanel
}
from
"../../../module/ctrls"
;
import
{
FreePowerPanel
}
from
"../../panels/FreePowerPanel"
;
import
{
FreePowerPanel
}
from
"../../panels/FreePowerPanel"
;
import
{
FesRedPrizePanel
}
from
"../../panels/FesRedPrizePanel"
;
export
class
MapScene
extends
Scene
{
export
class
MapScene
extends
Scene
{
private
mapContainer
:
Container
=
null
;
private
mapContainer
:
Container
=
null
;
...
@@ -57,6 +58,8 @@ export class MapScene extends Scene {
...
@@ -57,6 +58,8 @@ export class MapScene extends Scene {
Tools
.
baseInfo
.
loginAddPower
=
false
;
Tools
.
baseInfo
.
loginAddPower
=
false
;
}
}
showPanel
(
FesRedPrizePanel
);
}
}
private
updateMapCheck
()
{
private
updateMapCheck
()
{
...
...
src/something/class/FestivalEle.ts
View file @
07a667a8
...
@@ -6,6 +6,7 @@ import { RES } from "../../../module/RES";
...
@@ -6,6 +6,7 @@ import { RES } from "../../../module/RES";
*
*
*/
*/
export
class
FestivalEle
extends
FYGE
.
Container
{
export
class
FestivalEle
extends
FYGE
.
Container
{
_type
;
/**
/**
* 是否要分裂了
* 是否要分裂了
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment