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
f35c4a9c
Commit
f35c4a9c
authored
Jul 27, 2020
by
wjf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
l
parent
b4bb891d
Changes
18
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
8959 additions
and
175 deletions
+8959
-175
babycare.luckyDraw.json
mock/miniTb/babycare.luckyDraw.json
+20
-0
output.js
output.js
+417
-18
output.js.map
output.js.map
+1
-1
record.txt
record.txt
+3
-1
lotteryReturnBtn.png
resource/lotteryScene/lotteryReturnBtn.png
+0
-0
res.json
resource/res.json
+52
-52
egretTmToFyge.js
scripts/egretTmToFyge.js
+49
-0
ResJson.ts
src/ResJson.ts
+8338
-61
TaoBaoNet.ts
src/TaoBaoNet.ts
+5
-0
StartPanel.ts
src/panels/StartPanel.ts
+1
-1
StartPanelPrize.ts
src/panels/StartPanelPrize.ts
+1
-1
SuccessPrizePanel.ts
src/panels/SuccessPrizePanel.ts
+15
-12
TaskPanel.ts
src/panels/TaskPanel.ts
+1
-1
LoadingScene.ts
src/scene/LoadingScene.ts
+4
-2
LotteryScene.ts
src/scene/LotteryScene.ts
+28
-12
MapScene.ts
src/scene/map/MapScene.ts
+8
-6
MapUI.ts
src/scene/map/MapUI.ts
+14
-5
PropGuide.ts
src/something/uis/PropGuide.ts
+2
-2
No files found.
mock/miniTb/babycare.luckyDraw.json
0 → 100644
View file @
f35c4a9c
{
"code"
:
"000000"
,
"data"
:
{
"image"
:
"https://img.alicdn.com/imgextra/i1/2275046294/O1CN01TrcMYF1wMhRuCphHI_!!2275046294-2-miniprogram.png"
,
"level"
:
90
,
"drawStatus"
:
1
,
"openId"
:
"AAHuCvE-ALiIWXYsJuTb5S4W"
,
"createDay"
:
"2020/07/14"
,
"avatar"
:
"sdfwerwerwer"
,
"type"
:
3
,
"prizeId"
:
"5f08084e0cb7338a0a377c8d"
,
"activityId"
:
"5f08084ec3ad3494b9201c0e"
,
"ename"
:
""
,
"userNick"
:
"wmmmmm"
,
"name"
:
"90关奖品4"
,
"_id"
:
"AAHuCvE-ALiIWXYsJuTb5S4W1594715684002"
},
"success"
:
true
,
"message"
:
"成功"
}
\ No newline at end of file
output.js
View file @
f35c4a9c
This diff is collapsed.
Click to expand it.
output.js.map
View file @
f35c4a9c
This diff is collapsed.
Click to expand it.
record.txt
View file @
f35c4a9c
...
...
@@ -19,4 +19,6 @@ RES修改成与FYGE独立的贴图缓存,否则FYGE多页面应该会有同名
多page上的canvas,destroy最好别执行removeAllTweens,
多page上的canvas,对于相同资源是否考虑,还有公用弹框,(还是不考虑吧,多page只在活动相互独立的情况下使用)
\ No newline at end of file
多page上的canvas,对于相同资源是否考虑,还有公用弹框(可以考虑用dom的component),
(多page最好只在活动相互独立的情况下使用)
\ No newline at end of file
resource/lotteryScene/lotteryReturnBtn.png
0 → 100644
View file @
f35c4a9c
2.26 KB
resource/res.json
View file @
f35c4a9c
This diff is collapsed.
Click to expand it.
scripts/egretTmToFyge.js
0 → 100644
View file @
f35c4a9c
var
fs
=
require
(
"fs"
);
//测试脚本,白鹭的图集格式转fyge的图集格式
var
readPath
=
"./scripts/"
;
var
writePath
=
"./psd/"
//取指令后的参数
let
arg
=
process
.
argv
.
splice
(
2
);
//json名字
var
jsonName
=
arg
[
0
];
var
data
=
fs
.
readFileSync
(
readPath
+
jsonName
+
".json"
);
//反序列化
data
=
JSON
.
parse
(
data
);
let
frames
=
data
.
frames
;
var
obj
=
{};
for
(
var
key
in
frames
)
{
let
f
=
frames
[
key
];
obj
[
jsonName
+
key
+
".png"
]
=
{
"x"
:
f
.
x
,
"y"
:
f
.
y
,
"w"
:
f
.
w
,
"h"
:
f
.
h
,
"ox"
:
f
.
offX
,
"oy"
:
f
.
offY
,
"sw"
:
f
.
sourceW
,
"sh"
:
f
.
sourceH
,
"ro"
:
false
,
}
}
//写入
fs
.
writeFileSync
(
writePath
+
jsonName
+
".json"
,
JSON
.
stringify
(
obj
,
""
,
"
\
t"
));
//例子json
// {"file":"coin.png","frames":{
// "8":{"x":0,"y":0,"w":109,"h":112,"offX":3,"offY":1,"sourceW":115,"sourceH":115},
// "4":{"x":67,"y":340,"w":65,"h":113,"offX":25,"offY":1,"sourceW":115,"sourceH":115},
// "5":{"x":222,"y":0,"w":24,"h":108,"offX":45,"offY":3,"sourceW":115,"sourceH":115},
// "7":{"x":0,"y":114,"w":94,"h":113,"offX":10,"offY":1,"sourceW":115,"sourceH":115},
// "6":{"x":0,"y":229,"w":65,"h":114,"offX":25,"offY":0,"sourceW":115,"sourceH":115},
// "2":{"x":111,"y":0,"w":109,"h":111,"offX":3,"offY":2,"sourceW":115,"sourceH":115},
// "3":{"x":96,"y":225,"w":94,"h":113,"offX":10,"offY":1,"sourceW":115,"sourceH":115},
// "1":{"x":111,"y":113,"w":109,"h":110,"offX":3,"offY":2,"sourceW":115,"sourceH":115}}}
\ No newline at end of file
src/ResJson.ts
View file @
f35c4a9c
This diff is collapsed.
Click to expand it.
src/TaoBaoNet.ts
View file @
f35c4a9c
...
...
@@ -76,6 +76,11 @@ export enum TbNetName {
* activityId
*/
getTaskList
=
"babycare.getTaskList"
,
/**
* 抽奖
* activityId
*/
luckyDraw
=
"babycare.luckyDraw"
,
///////////////////前端调用接口都加个mine
...
...
src/panels/StartPanel.ts
View file @
f35c4a9c
...
...
@@ -69,9 +69,9 @@ export class StartPanel extends Panel {
if
(
!
success
)
return
;
Tools
.
gameData
.
power
=
res
.
data
.
power
;
changeScene
(
PlayScene
,
{
chapter
:
this
.
data
.
level
});
this
.
hidePanel
();
}
);
this
.
hidePanel
();
}
initEvents
()
{
...
...
src/panels/StartPanelPrize.ts
View file @
f35c4a9c
...
...
@@ -71,9 +71,9 @@ export class StartPanelPrize extends Panel {
if
(
!
success
)
return
;
Tools
.
gameData
.
power
=
res
.
data
.
power
;
changeScene
(
PlayScene
,
{
chapter
:
this
.
data
.
level
});
this
.
hidePanel
();
}
);
this
.
hidePanel
();
}
initEvents
()
{
...
...
src/panels/SuccessPrizePanel.ts
View file @
f35c4a9c
...
...
@@ -12,6 +12,7 @@ import TextField = FYGE.TextField;
import
{
changeScene
}
from
"../../module/ctrls"
;
import
{
MapScene
}
from
"../scene/map/MapScene"
;
import
MouseEvent
=
FYGE
.
MouseEvent
;
import
{
LotteryScene
}
from
"../scene/LotteryScene"
;
export
class
SuccessPrizePanel
extends
Panel
{
get
groupNames
()
{
...
...
@@ -27,8 +28,8 @@ export class SuccessPrizePanel extends Panel {
this
.
isShowing
=
true
;
this
.
anchor
.
set
(
375
,
812
);
Tween
.
get
(
this
)
.
set
({
scaleX
:
0
,
scaleY
:
0
})
.
to
({
scaleX
:
1
,
scaleY
:
1
},
400
,
Ease
.
backOut
)
.
set
({
scaleX
:
0
,
scaleY
:
0
})
.
to
({
scaleX
:
1
,
scaleY
:
1
},
400
,
Ease
.
backOut
)
.
call
(()
=>
{
this
.
isShowing
=
false
;
});
...
...
@@ -100,13 +101,13 @@ export class SuccessPrizePanel extends Panel {
}
private
lightEffect
()
{
Tween
.
get
(
this
.
light1
,
{
loop
:
true
})
.
set
({
anchorX
:
219.5
,
anchorY
:
219.5
})
.
to
({
rotation
:
360
},
12000
);
Tween
.
get
(
this
.
light1
,
{
loop
:
true
})
.
set
({
anchorX
:
219.5
,
anchorY
:
219.5
})
.
to
({
rotation
:
360
},
12000
);
Tween
.
get
(
this
.
light2
,
{
loop
:
true
})
.
set
({
anchorX
:
219.5
,
anchorY
:
219.5
})
.
to
({
rotation
:
-
360
},
12000
);
Tween
.
get
(
this
.
light2
,
{
loop
:
true
})
.
set
({
anchorX
:
219.5
,
anchorY
:
219.5
})
.
to
({
rotation
:
-
360
},
12000
);
}
start
(
data
)
{
...
...
@@ -117,7 +118,7 @@ export class SuccessPrizePanel extends Panel {
* 挑战满星
*/
private
again
()
{
changeScene
(
MapScene
,
{
level
:
this
.
data
.
level
});
changeScene
(
MapScene
,
{
level
:
this
.
data
.
level
});
super
.
hidePanel
();
}
...
...
@@ -128,14 +129,16 @@ export class SuccessPrizePanel extends Panel {
if
(
this
.
data
.
level
==
120
)
{
changeScene
(
MapScene
);
}
else
{
changeScene
(
MapScene
,
{
level
:
this
.
data
.
level
+
1
});
changeScene
(
MapScene
,
{
level
:
this
.
data
.
level
+
1
});
}
super
.
hidePanel
();
}
public
goPrize
(){
/// TODO 去抽奖
public
goPrize
()
{
// 去抽奖
changeScene
(
LotteryScene
,
{
level
:
this
.
data
.
level
})
super
.
hidePanel
();
}
...
...
src/panels/TaskPanel.ts
View file @
f35c4a9c
...
...
@@ -245,7 +245,7 @@ class CusButton extends Button {
if
(
this
.
type
==
TaskType
.
browseGoods
||
this
.
type
==
TaskType
.
member
)
{
//都需要添加事件,回来时,派发事件刷任务接口
GDispatcher
.
once
(
G_EVENT
.
ON_SHOW
,
()
=>
{
GDispatcher
.
dispatchEvent
(
G_EVENT
.
ON_SHOW
)
GDispatcher
.
dispatchEvent
(
G_EVENT
.
UPDATE_TASK
)
},
this
)
}
}
...
...
src/scene/LoadingScene.ts
View file @
f35c4a9c
...
...
@@ -2,7 +2,7 @@ import { Scene } from "../../module/views/Scene";
import
{
Tools
}
from
"../Tools"
;
import
{
ProgressBarS
}
from
"../common/ProgressBarS"
;
import
{
RES
}
from
"../../module/RES"
;
import
{
sendTbNet
,
TbNetName
}
from
"../TaoBaoNet"
;
import
{
sendTbNet
,
TbNetName
,
getTbData
}
from
"../TaoBaoNet"
;
import
{
changeScene
}
from
"../../module/ctrls"
;
import
{
MapScene
}
from
"./map/MapScene"
;
import
{
layers
}
from
"../../module/views/layers"
;
...
...
@@ -106,10 +106,12 @@ export class LoadingScene extends Scene {
//获取首页数据
var
getIndexSuccesss
=
await
Tools
.
getIndex
()
//失败不进入
if
(
!
getIndexSuccesss
)
return
;
this
.
dispatchEvent
(
FYGE
.
Event
.
PROGRESS
,
0.3
);
//赋值openId,取getIndex里的数据
Tools
.
globalData
.
openId
=
getTbData
(
TbNetName
.
getIndex
).
data
.
openId
;
// 游戏基本信息
const
baseInfo
=
await
sendTbNet
(
TbNetName
.
getActivityBaseInfoById
);
Tools
.
baseInfo
=
baseInfo
.
data
;
...
...
src/scene/LotteryScene.ts
View file @
f35c4a9c
...
...
@@ -2,15 +2,20 @@ import { Scene } from "../../module/views/Scene";
import
{
RES
}
from
"../../module/RES"
;
import
{
layers
}
from
"../../module/views/layers"
;
import
{
Tools
}
from
"../Tools"
;
import
{
showWaiting
,
wait
}
from
"../../module/ctrls"
;
import
{
showWaiting
,
wait
,
changeScene
,
hideWaiting
,
showPanel
}
from
"../../module/ctrls"
;
import
{
sendTbNet
,
TbNetName
}
from
"../TaoBaoNet"
;
import
{
GTool
}
from
"../../module/tools/GTool"
;
import
{
MapScene
}
from
"./map/MapScene"
;
import
{
PrizePanel
}
from
"../panels/PrizePanel"
;
import
{
NoPrizePanel
}
from
"../panels/NoPrizePanel"
;
/**
* 摇奖机弹框
*/
export
class
LotteryScene
extends
Scene
{
get
groupNames
()
{
return
[
"lotteryScene"
]
}
lotScroll
:
LotteryScroll
;
data
:
{
level
:
number
,
}
...
...
@@ -53,6 +58,10 @@ export class LotteryScene extends Scene {
this
.
addChild
(
new
FYGE
.
Button
(
RES
.
getRes
(
"lotteryBtn.png"
)))
.
addEventListener
(
FYGE
.
MouseEvent
.
CLICK
,
this
.
lottery
,
this
)
.
position
.
set
((
750
-
RES
.
getRes
(
"lotteryBtn.png"
).
width
)
/
2
,
797
);
//返回按钮,回到地图页
this
.
addChild
(
new
FYGE
.
Button
(
RES
.
getRes
(
"lotteryReturnBtn.png"
)))
.
addEventListener
(
FYGE
.
MouseEvent
.
CLICK
,
()
=>
{
changeScene
(
MapScene
)
},
this
)
.
position
.
set
(
0
,
300
)
//刷新奖品列表和摇奖列表
this
.
updatePrizes
();
}
...
...
@@ -60,24 +69,31 @@ export class LotteryScene extends Scene {
showWaiting
();
const
{
data
:
prizeList
}
=
await
sendTbNet
(
TbNetName
.
getPrizesByLevel
,
{
level
:
this
.
data
.
level
});
//滚动列表
console
.
log
(
prizeList
)
//
console.log(prizeList)
var
scroll
=
this
.
addChild
(
new
FYGE
.
ScrollList
(
PrizeItem
,
122
,
140
,
345
,
152
,
false
))
scroll
.
position
.
set
(
195
,
1013
);
scroll
.
updateData
(
prizeList
||
[])
//摇奖部分
var
p
=
[
201
,
620
]
var
lotScroll
=
this
.
addChild
(
new
LotteryScroll
(
prizeList
))
lotScroll
.
position
.
set
(
p
[
0
],
p
[
1
]);
// console.log(lotScroll);
window
[
"aa"
]
=
function
(
id
)
{
lotScroll
.
lot
(
id
,
()
=>
{
console
.
log
(
123123
)
})
}
this
.
lotScroll
=
this
.
addChild
(
new
LotteryScroll
(
prizeList
))
this
.
lotScroll
.
position
.
set
(
p
[
0
],
p
[
1
]);
}
lottery
()
{
showWaiting
()
sendTbNet
(
TbNetName
.
luckyDraw
)
.
then
((
res
)
=>
{
hideWaiting
();
//如果是失败
if
(
!
res
.
success
)
return
;
let
id
;
if
(
res
.
data
&&
res
.
data
.
_id
)
id
=
res
.
data
.
_id
;
this
.
enableMouseEvt
(
false
);
this
.
lotScroll
.
lot
(
id
,
()
=>
{
this
.
enableMouseEvt
(
true
)
//弹框
showPanel
(
id
?
PrizePanel
:
NoPrizePanel
,
id
?
res
.
data
:
null
)
})
})
}
}
interface
PrizeInt
{
...
...
src/scene/map/MapScene.ts
View file @
f35c4a9c
...
...
@@ -50,7 +50,7 @@ export class MapScene extends Scene {
888
,
true
,
true
));
this
.
mapContainer
=
this
.
scrollPage
.
view
.
addChild
(
new
Container
());
this
.
uiLayer
=
this
.
addChild
(
new
MapUI
());
// this.uiLayer = this.addChild(new MapUI());//待测试,在下面updateMapCheck里再初始化
this
.
initMap
();
this
.
updateMapCheck
();
...
...
@@ -69,13 +69,15 @@ export class MapScene extends Scene {
private
updateMapCheck
()
{
if
(
this
.
data
&&
this
.
data
.
from
==
'loading'
)
{
this
.
uiLayer
=
this
.
addChild
(
new
MapUI
());
this
.
initMapByData
(
Tools
.
gameData
);
if
(
Tools
.
gameData
.
isFristLogin
)
{
this
.
initGuide
();
}
}
else
{
Tools
.
getGameInfo
().
then
((
success
)
=>
{
if
(
success
)
{
if
(
success
)
{
//不考虑失败的情况
this
.
uiLayer
=
this
.
addChild
(
new
MapUI
());
this
.
initMapByData
(
Tools
.
gameData
);
}
});
...
...
@@ -91,7 +93,7 @@ export class MapScene extends Scene {
g
.
beginFill
(
0
,
0.6
);
g
.
drawRect
(
0
,
0
,
layers
.
stageWidth
,
layers
.
stageHeight
);
g
.
endFill
();
const
guide_check
=
guide
.
addChild
(
new
CheckBtn
({
check
:
1
}));
const
guide_check
=
guide
.
addChild
(
new
CheckBtn
({
check
:
1
}));
guide_check
.
enabled
=
true
;
guide_check
.
type
=
CHECK_TYPE
.
CUR
;
guide_check
.
position
.
set
(
MapScene
.
checkArr
[
1
].
x
,
layers
.
stageHeight
-
162
);
...
...
@@ -118,15 +120,15 @@ export class MapScene extends Scene {
guide
.
alpha
=
0
;
Tween
.
get
(
guide
)
.
to
({
alpha
:
1
},
600
,
Ease
.
quadInOut
);
.
to
({
alpha
:
1
},
600
,
Ease
.
quadInOut
);
Tween
.
get
(
guide_fox
)
.
wait
(
300
)
.
to
({
y
:
guide_check
.
y
-
345
,
alpha
:
1
},
300
,
Ease
.
quadInOut
)
.
to
({
y
:
guide_check
.
y
-
345
,
alpha
:
1
},
300
,
Ease
.
quadInOut
)
.
wait
(
100
)
.
call
(()
=>
{
Tween
.
get
(
guide_tip
)
.
to
({
scaleX
:
1
,
scaleY
:
1
},
300
,
Ease
.
quadInOut
);
.
to
({
scaleX
:
1
,
scaleY
:
1
},
300
,
Ease
.
quadInOut
);
});
}
...
...
src/scene/map/MapUI.ts
View file @
f35c4a9c
...
...
@@ -6,12 +6,13 @@ import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import
{
RES
}
from
"../../../module/RES"
;
import
{
Tools
}
from
"../../Tools"
;
import
MouseEvent
=
FYGE
.
MouseEvent
;
import
{
showPanel
}
from
"../../../module/ctrls"
;
import
{
showPanel
,
changeScene
,
showToast
}
from
"../../../module/ctrls"
;
import
{
RulePanel
}
from
"../../panels/RulePanel"
;
import
{
BuyPowerPanel
}
from
"../../panels/BuyPowerPanel"
;
import
{
TaskPanel
}
from
"../../panels/TaskPanel"
;
import
{
sendTbNet
,
TbNetName
}
from
"../../TaoBaoNet"
;
import
Texture
=
FYGE
.
Texture
;
import
{
LotteryScene
}
from
"../LotteryScene"
;
export
default
class
MapUI
extends
Container
{
public
energyBox
:
EnergyBox
=
null
;
...
...
@@ -61,7 +62,7 @@ export default class MapUI extends Container {
break
;
case
this
.
prizeBox
:
/// TODO 奖励盒子,有条件的吧
/// TODO 奖励盒子,有条件的吧
,放在类里了prizeBox
console
.
log
(
'奖励盒子'
);
break
;
...
...
@@ -247,11 +248,18 @@ class PrizeBox extends Button {
this
.
tip
.
text
=
''
;
this
.
prizeImg
.
texture
=
Texture
.
fromUrl
(
Tools
.
baseInfo
.
levelPrize
[
`level_
${
upLevel
}
`
]);
this
.
prizeImg
.
y
-=
20
;
this
.
addEventListener
(
FYGE
.
MouseEvent
.
CLICK
,
()
=>
{
//有需要,到时再改
showToast
(
this
.
checkTip
.
text
+
"才可以抽奖哦"
)
},
this
)
}
else
if
(
prizes
.
length
==
1
&&
+
prizes
[
0
].
level
==
120
)
{
this
.
checkTip
.
text
=
`等待开奖`
;
this
.
tip
.
text
=
`8月28日10点\n开启大奖`
;
this
.
prizeImg
.
texture
=
Texture
.
fromUrl
(
Tools
.
baseInfo
.
levelPrize
[
'level_120'
]);
this
.
addEventListener
(
FYGE
.
MouseEvent
.
CLICK
,
()
=>
{
//有需要,到时再改
showToast
(
this
.
tip
.
text
)
},
this
)
}
else
{
let
lowerLevel
=
120
;
prizes
.
forEach
((
value
)
=>
{
...
...
@@ -263,11 +271,12 @@ class PrizeBox extends Button {
this
.
tip
.
text
=
`抽取
${
lowerLevel
}
关奖励`
;
this
.
tip
.
y
+=
10
;
this
.
prizeImg
.
texture
=
Texture
.
fromUrl
(
Tools
.
baseInfo
.
levelPrize
[
`level_
${
lowerLevel
}
`
]);
this
.
addEventListener
(
FYGE
.
MouseEvent
.
CLICK
,
()
=>
{
changeScene
(
LotteryScene
,
{
level
:
lowerLevel
})
},
this
)
}
}
initEvent
()
{
}
}
src/something/uis/PropGuide.ts
View file @
f35c4a9c
...
...
@@ -38,7 +38,7 @@ export class PropGuide extends FYGE.Container {
text
.
fillColor
=
"#ffffff"
;
text
.
size
=
20
;
text
.
x
=
(
750
-
500
)
/
2
;
text
.
y
=
offsetY
-
92
;
text
.
y
=
offsetY
-
30
;
text
.
textAlign
=
FYGE
.
TEXT_ALIGN
.
CENTER
;
text
.
textWidth
=
500
;
this
.
addChild
(
text
);
...
...
@@ -75,7 +75,7 @@ export class PropGuide extends FYGE.Container {
this
.
bg
.
moveTo
(
stepPosition
[
0
]
+
50
,
stepPosition
[
1
])
this
.
bg
.
drawCircle
(
stepPosition
[
0
],
stepPosition
[
1
],
50
,
false
)
this
.
bg
.
endFill
();
this
.
msgTxt
.
text
=
"点击
左
上方步数,可为闯关时增加额外5次步数"
;
this
.
msgTxt
.
text
=
"点击上方步数,可为闯关时增加额外5次步数"
;
// this.msgTxt.x = 320;
}
}
...
...
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