Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xiaoxiaole
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
wildfirecode13
xiaoxiaole
Commits
54294280
Commit
54294280
authored
May 18, 2020
by
zjz1994
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole
into 726-750关卡
parents
6a028552
deecdc2b
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
302 additions
and
185 deletions
+302
-185
MainBase.ts
egret/libs/new_wx/MainBase.ts
+30
-1
NetManager.ts
egret/libs/tw/manager/NetManager.ts
+17
-10
Main2Skin.exml
egret/resource/skins/Main2Skin.exml
+27
-17
MapSkin.exml
egret/resource/skins/MapSkin.exml
+140
-124
MainScene.ts
egret/src/mainScene/MainScene.ts
+42
-19
MapScene.ts
egret/src/mapScene/MapScene.ts
+18
-1
PropBtnCon.ts
egret/src/something/uis/PropBtnCon.ts
+8
-1
PropGuide.ts
egret/src/something/uis/PropGuide.ts
+20
-12
No files found.
egret/libs/new_wx/MainBase.ts
View file @
54294280
...
...
@@ -106,6 +106,7 @@ export default class MainBase extends eui.UILayer {
// baseApi.enableTitleShow(false);
// }, false);
document
.
addEventListener
(
"deviceready"
,
()
=>
{
console
.
log
(
"苏宁baseapi准备完毕1111"
);
window
[
'baseApi'
].
enableTitleShow
(
false
);
},
false
);
}
...
...
@@ -582,11 +583,13 @@ export default class MainBase extends eui.UILayer {
}
protected
async
createGameScene
()
{
window
[
'getaward'
]
=
()
=>
{
getRedBombAward
((
param
)
=>
{
console
.
log
(
param
)
})
};
localStorage
.
setItem
(
'taskCenter'
+
window
[
'CFG'
].
consumerId
,
'true'
);
// 任务中心强提示,每次进入游戏只强提示一次
await
this
.
hcHome
();
await
Promise
.
all
([
this
.
getAd
(),
//
this.getAd(),
this
.
ajaxElement
(),
this
.
hc_userInfo
(),
this
.
getBackReward
(),
...
...
@@ -595,6 +598,32 @@ export default class MainBase extends eui.UILayer {
this
.
getInviteInfo
(),
this
.
hbRainBaseInfo
(),
]);
if
(
GFun
.
isIOS
){
}
else
{
console
.
log
(
"苏宁安卓开始准备"
);
if
(
!
window
[
'baseApi'
]){
await
new
Promise
((
resolve
,
reject
)
=>
{
// let t1 = setTimeout(() => {
// console.log("苏宁准备失败");
// resolve();
// }, 6000);
document
.
addEventListener
(
"deviceready"
,
function
()
{
console
.
log
(
"苏宁baseapi准备完毕222"
);
// clearTimeout(t1);
resolve
();
}.
bind
(
this
),
false
);
})
console
.
log
(
"游戏继续"
);
}
else
{
console
.
log
(
"已经获得baseapi,游戏继续"
);
}
}
await
this
.
getAd
();
//获取分享加体力的shareCode,不影响初始化场景,不进await
NetManager
.
ins
.
getUserShareCode
(()
=>
{
})
...
...
egret/libs/tw/manager/NetManager.ts
View file @
54294280
...
...
@@ -1462,7 +1462,7 @@ export class NetManager extends ABNetManager {
}
public
hc_advert
(
callback
:
Function
):
void
{
var
device
i
d
:
string
=
''
;
var
device
I
d
:
string
=
''
;
const
net
:
INetData
=
{
name
:
'hc_advert'
,
uri
:
window
[
'duiba'
]
+
'/customActivity/happyclear/advert'
,
...
...
@@ -1470,32 +1470,39 @@ export class NetManager extends ABNetManager {
dataType
:
'json'
,
param
:
{
activityId
:
DataManager
.
ins
.
customCfgData
.
actId
,
device
id
:
devicei
d
device
Id
:
deviceI
d
},
hideMsg
:
true
,
callback
:
callback
};
try
{
if
(
window
[
'SNNativeClient'
]){
// console.log("苏宁原生测试",window['baseApi']);
if
(
window
[
'baseApi'
]){
console
.
log
(
"苏宁原生测试"
,
GFun
.
isIOS
);
console
.
log
(
window
[
'SNNativeClient'
]);
window
[
'SNNativeClient'
].
getClientInfo
(
function
(
res
){
console
.
log
(
"啦啦啦SNNativeClientFunc"
,
res
);
window
[
'baseApi'
].
getClientInfo
(
function
(
res
){
console
.
log
(
"啦啦啦baseApi----info"
,
res
);
if
(
res
){
var
resdata
;
if
(
typeof
res
==
"string"
){
resdata
=
JSON
.
parse
(
res
);
}
else
{
resdata
=
res
;
}
if
(
GFun
.
isIOS
){
device
id
=
res
.
imsi
||
''
;
device
Id
=
resdata
.
identifier
||
''
;
}
else
{
device
id
=
res
.
imei
||
''
;
device
Id
=
resdata
.
imei
||
''
;
}
}
console
.
log
(
'新增device
id'
,
devicei
d
);
net
.
param
.
device
id
=
devicei
d
;
console
.
log
(
'新增device
Id'
,
deviceI
d
);
net
.
param
.
device
Id
=
deviceI
d
;
this
.
send
(
net
);
}.
bind
(
this
));
}
else
{
this
.
send
(
net
);
}
}
catch
(
e
){
console
.
log
(
'一般获取'
);
this
.
send
(
net
);
}
}
...
...
egret/resource/skins/Main2Skin.exml
View file @
54294280
...
...
@@ -5,23 +5,15 @@
</w:Declarations>
<e:Image
x=
"0"
y=
"0"
source=
"playSceneBg_jpg"
/>
<e:Image
source=
"lef_png"
y=
"-2"
x=
"0"
/>
<e:Image
y=
"199.5"
source=
"targetBoard_png"
x=
"174"
/>
<e:Image
y=
"-47.5"
source=
"progressDown_png"
horizontalCenter=
"0"
/>
<e:Image
id=
"starProgress"
x=
"138"
y=
"159.35"
source=
"starProgress_png"
/>
<e:Group
id=
"chaptergro"
width=
"750"
height=
"200"
/>
<e:Image
x=
"69"
y=
"-64.5"
source=
"stepsBoard_png"
/>
<e:Image
x=
"171.5"
y=
"166.35"
source=
"dangqianfenshu_png"
/>
<e:Label
id=
"targetScoreTxt"
touchEnabled=
"false"
size=
"26"
width=
"292.85"
anchorOffsetY=
"0"
height=
"36"
textAlign=
"center"
anchorOffsetX=
"0"
verticalAlign=
"middle"
fontFamily=
"Microsoft YaHei"
text=
"目标分数"
y=
"234.85"
textColor=
"0x9d4a06"
bold=
"true"
horizontalCenter=
"0.5"
/>
<e:Group
id=
"settingAll"
width=
"89"
height=
"203"
x=
"641"
y=
"5.5"
anchorOffsetY=
"0"
>
<e:Group
id=
"adapttop"
width=
"750"
height=
"1624"
horizontalCenter=
"0"
y=
"0"
touchEnabled=
"false"
touchThrough=
"true"
>
<e:Image
y=
"199.5"
source=
"targetBoard_png"
x=
"174"
scaleX=
"1"
scaleY=
"1"
/>
<e:Image
y=
"-47.5"
source=
"progressDown_png"
horizontalCenter=
"0"
x=
"11"
scaleX=
"1"
scaleY=
"1"
/>
<e:Image
id=
"starProgress"
x=
"138"
y=
"159.35"
source=
"starProgress_png"
scaleX=
"1"
scaleY=
"1"
/>
<e:Group
id=
"chaptergro"
width=
"750"
height=
"200"
x=
"0"
y=
"0"
scaleX=
"1"
scaleY=
"1"
/>
<e:Image
x=
"69"
y=
"-64.5"
source=
"stepsBoard_png"
scaleX=
"1"
scaleY=
"1"
/>
<e:Image
x=
"171.5"
y=
"166.35"
source=
"dangqianfenshu_png"
scaleX=
"1"
scaleY=
"1"
/>
<e:Label
id=
"targetScoreTxt"
touchEnabled=
"false"
size=
"26"
width=
"292.85"
anchorOffsetY=
"0"
height=
"36"
textAlign=
"center"
anchorOffsetX=
"0"
verticalAlign=
"middle"
fontFamily=
"Microsoft YaHei"
text=
"目标分数"
y=
"234.85"
textColor=
"0x9d4a06"
bold=
"true"
horizontalCenter=
"0.5"
x=
"229"
scaleX=
"1"
scaleY=
"1"
/>
<e:Group
id=
"settingAll"
width=
"89"
height=
"203"
x=
"641"
y=
"5.5"
anchorOffsetY=
"0"
scaleX=
"1"
scaleY=
"1"
>
<e:Group
id=
"settingGroup"
width=
"72"
height=
"282"
x=
"8"
y=
"29"
anchorOffsetX=
"0"
visible=
"false"
>
<e:Image
y=
"-13.03"
source=
"mainSettingBg_png"
horizontalCenter=
"0"
/>
<e:Image
id=
"questionBtn"
y=
"53"
source=
"mainQuestionBtn_png"
horizontalCenter=
"1"
/>
...
...
@@ -31,6 +23,24 @@
</e:Group>
<e:Image
id=
"settingBtn"
y=
"1"
source=
"setting_png"
horizontalCenter=
"0"
/>
</e:Group>
</e:Group>
<e:Group
id=
"redrainbg"
width=
"750"
height=
"1624"
visible=
"false"
>
<e:Image
source=
"redrainbg_jpg"
/>
<e:Label
id=
"tips"
text=
"正在加载中,请稍后"
y=
"826.33"
textColor=
"0x244B00"
horizontalCenter=
"0"
size=
"24"
visible=
"false"
/>
...
...
egret/resource/skins/MapSkin.exml
View file @
54294280
...
...
@@ -5,6 +5,7 @@
<e:Group
id=
"scrollGroup"
>
</e:Group>
</e:Scroller>
<e:Group
id=
"adapttop"
width=
"750"
height=
"1206"
y=
"0"
horizontalCenter=
"0"
touchEnabled=
"false"
touchThrough=
"true"
>
<e:Group
id=
"treasureboxBtn"
y=
"40"
x=
"537"
scaleX=
"1"
scaleY=
"1"
anchorOffsetX=
"0"
width=
"193.33"
height=
"82"
>
<e:Image
source=
"宝箱bg_png"
y=
"13.33"
x=
"4.18"
/>
<e:Group
x=
"80.34"
y=
"23.48"
anchorOffsetX=
"0"
width=
"104"
>
...
...
@@ -45,7 +46,7 @@
</e:Button>
<e:Label
id=
"countdown"
text=
"00:00:00"
verticalAlign=
"middle"
textAlign=
"center"
size=
"19"
fontFamily=
"FZY4JW"
anchorOffsetX=
"0"
width=
"87"
anchorOffsetY=
"0"
height=
"37"
strokeColor=
"0x4365ac"
stroke=
"2"
verticalCenter=
"0.5"
horizontalCenter=
"-84.25"
/>
</e:Group>
<e:Button
id=
"shopBtn"
label=
""
x=
"613.08"
y=
"174.01"
visible=
"false
"
>
<e:Button
id=
"shopBtn"
label=
""
x=
"613.08"
y=
"174.01"
visible=
"false"
scaleX=
"1"
scaleY=
"1
"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"道具_png"
source.down=
"道具_png"
source.disabled=
"道具_png"
/>
...
...
@@ -53,7 +54,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button
id=
"recordBtn"
label=
""
x=
"597"
y=
"174.57"
locked=
"true
"
>
<e:Button
id=
"recordBtn"
label=
""
x=
"597"
y=
"174.57"
scaleX=
"1"
scaleY=
"1
"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"recordbtn_png"
source.down=
"recordbtn_png"
source.disabled=
"recordbtn_png"
/>
...
...
@@ -61,7 +62,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group
id=
"friendBtn"
x=
"-0.12"
y=
"22.31"
width=
"171"
height=
"120"
locked=
"true
"
>
<e:Group
id=
"friendBtn"
x=
"-0.12"
y=
"22.31"
width=
"171"
height=
"120"
scaleX=
"1"
scaleY=
"1
"
>
<e:Image
source=
"avatar_png"
y=
"0"
horizontalCenter=
"0"
/>
<e:Group
x=
"38.5"
y=
"10"
>
<e:Image
id=
"avatar"
y=
"-2.87"
source=
""
width=
"70"
height=
"70"
x=
"11.31"
anchorOffsetX=
"0"
anchorOffsetY=
"0"
/>
...
...
@@ -70,8 +71,8 @@
<e:Image
source=
"namebg_png"
horizontalCenter=
"-4"
bottom=
"-4"
/>
<e:Label
id=
"nameTxt"
text=
"La121233bel"
y=
"80.06"
size=
"19"
horizontalCenter=
"-3"
fontFamily=
"FZY3JW"
/>
</e:Group>
<e:Image
id=
"adBtn"
y=
"478"
right=
"602"
width=
"122"
height=
"122"
source=
"
"
/>
<e:Button
id=
"taskBtn1"
label=
""
x=
"572.62"
y=
"248.51"
visible=
"false
"
>
<e:Image
id=
"adBtn"
y=
"478"
right=
"602"
width=
"122"
height=
"122"
source=
""
x=
"26"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Button
id=
"taskBtn1"
label=
""
x=
"572.62"
y=
"248.51"
visible=
"false"
scaleX=
"1"
scaleY=
"1
"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"taskicon_png"
source.down=
"taskicon_png"
source.disabled=
"taskicon_png"
/>
...
...
@@ -79,7 +80,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group
id=
"signGroup"
x=
"26.69"
y=
"172.57"
locked=
"true
"
>
<e:Group
id=
"signGroup"
x=
"26.69"
y=
"172.57"
scaleX=
"1"
scaleY=
"1
"
>
<e:Button
id=
"signBtn"
label=
""
y=
"0"
horizontalCenter=
"0"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
...
...
@@ -93,7 +94,7 @@
<e:Image
id=
"sign_s2"
source=
"map明日可领_png"
x=
"1.33"
y=
"0"
visible=
"false"
/>
</e:Group>
</e:Group>
<e:Group
id=
"inviteGroup"
x=
"16.69"
y=
"323.76"
anchorOffsetX=
"0"
width=
"132"
visible=
"false
"
>
<e:Group
id=
"inviteGroup"
x=
"16.69"
y=
"323.76"
anchorOffsetX=
"0"
width=
"132"
visible=
"false"
scaleX=
"1"
scaleY=
"1
"
>
<e:Button
id=
"inviteBtn"
label=
""
x=
"10"
y=
"1.54"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
...
...
@@ -107,7 +108,7 @@
<e:Label
id=
"inviteTips"
text=
"立即到账"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
size=
"22"
fontFamily=
"FZY4JW"
stroke=
"2"
strokeColor=
"0xc74417"
textColor=
"0xfff1c2"
/>
</e:Group>
</e:Group>
<e:Group
id=
"turnTableGroup"
x=
"589.5"
y=
"475"
anchorOffsetX=
"0"
width=
"134
"
>
<e:Group
id=
"turnTableGroup"
x=
"589.5"
y=
"475"
anchorOffsetX=
"0"
width=
"134"
scaleX=
"1"
scaleY=
"1
"
>
<e:Button
id=
"turnTableBtn"
label=
""
y=
"0"
horizontalCenter=
"0"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
...
...
@@ -121,7 +122,7 @@
<e:Label
id=
"turnTableTips"
text=
"立即到"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
size=
"22"
fontFamily=
"FZY4JW"
strokeColor=
"0xc74417"
stroke=
"2"
textColor=
"0xfff1c2"
/>
</e:Group>
</e:Group>
<e:Group
id=
"scratchGroup"
y=
"631"
right=
"25
"
>
<e:Group
id=
"scratchGroup"
y=
"631"
right=
"25"
x=
"588"
scaleX=
"1"
scaleY=
"1
"
>
<e:Button
id=
"scratchBtn"
label=
""
y=
"0"
x=
"-5.32"
locked=
"true"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
...
...
@@ -135,7 +136,7 @@
<e:Label
id=
"scratchTips"
text=
"立即到"
verticalCenter=
"-0.5"
verticalAlign=
"middle"
textAlign=
"center"
size=
"22"
fontFamily=
"FZY4JW"
horizontalCenter=
"0"
strokeColor=
"0xc74417"
stroke=
"2"
textColor=
"0xfff1c2"
/>
</e:Group>
</e:Group>
<e:Group
id=
"taskGroup"
y=
"325"
right=
"30
"
>
<e:Group
id=
"taskGroup"
y=
"325"
right=
"30"
x=
"594"
scaleX=
"1"
scaleY=
"1
"
>
<e:Button
id=
"taskBtn"
label=
""
y=
"0"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
...
...
@@ -149,7 +150,7 @@
<e:Label
id=
"taskTips"
text=
"有优惠"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
size=
"22"
fontFamily=
"FZY4JW"
strokeColor=
"0xc74417"
stroke=
"2"
textColor=
"0xfff1c2"
/>
</e:Group>
</e:Group>
<e:Group
id=
"activitys"
x=
"13.4"
y=
"620.55"
touchEnabled=
"false
"
>
<e:Group
id=
"activitys"
x=
"13.4"
y=
"620.55"
touchEnabled=
"false"
scaleX=
"1"
scaleY=
"1
"
>
<e:Group
id=
"actIconsGroup"
x=
"-8.88"
y=
"-4"
>
<e:Image
id=
"actIconsBg2"
source=
"map2+bg_png"
x=
"-27.15"
y=
"0"
visible=
"false"
/>
<e:Image
id=
"actIconsBg1"
x=
"-29.27"
y=
"10"
source=
"map2+bg2_png"
visible=
"false"
/>
...
...
@@ -170,6 +171,24 @@
<e:Image
id=
"actsShowBtn"
source=
"map2+_png"
x=
"9.29"
y=
"17.45"
/>
<e:Image
id=
"actTips"
source=
"maphot_png"
x=
"96.82"
y=
"3.44"
/>
</e:Group>
<e:Group
id=
"guide"
x=
"0"
y=
"0"
scaleX=
"1"
scaleY=
"1"
visible=
"false"
>
<e:Rect
width=
"750"
height=
"1624"
x=
"0"
y=
"0"
alpha=
"0.7"
/>
<e:Image
id=
"guideInner"
source=
"map2热门引导_png"
x=
"3.7"
y=
"336.77"
/>
</e:Group>
</e:Group>
<e:Group
id=
"settingsx"
scaleX=
"1"
scaleY=
"1"
touchEnabled=
"false"
bottom=
"23"
left=
"30"
>
<e:Group
id=
"settingGroup"
verticalCenter=
"0"
horizontalCenter=
"0"
visible=
"false"
>
<e:Image
id=
"settingbg"
source=
"设置bg_png"
verticalCenter=
"0"
horizontalCenter=
"0"
scale9Grid=
"44,0,250,89"
/>
...
...
@@ -229,9 +248,6 @@
<e:Image
source=
"common_box_btn_png"
y=
"957.41"
x=
"189"
scaleX=
"1"
scaleY=
"1"
/>
</e:Group>
</e:Group>
<e:Group
id=
"guide"
visible=
"false"
locked=
"true"
>
<e:Rect
width=
"750"
height=
"1624"
x=
"0"
y=
"0"
alpha=
"0.7"
/>
<e:Image
id=
"guideInner"
source=
"map2热门引导_png"
x=
"3.7"
y=
"336.77"
/>
</e:Group>
<w:Config
id=
"16c89f4ae1a"
/>
</e:Skin>
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @
54294280
...
...
@@ -412,13 +412,44 @@ export default class MainScene extends Scene {
}
>
}
>
=
[];
islongScreen
:
boolean
=
false
;
constructor
(){
super
();
window
[
'gm'
]
=
this
.
gm
;
//选择框 无需加入场景
var
textureChoosed
:
egret
.
Texture
=
RES
.
getRes
(
"chooseRect_png"
)
this
.
choosed
=
new
eui
.
Image
(
textureChoosed
);
this
.
choosed
.
x
=
-
textureChoosed
.
textureWidth
/
2
;
this
.
choosed
.
y
=
-
textureChoosed
.
textureHeight
/
2
;
//bonusTime引导,备用的,无需加入场景
this
.
bonusTime
=
new
BonusTime
();
this
.
bonusTime
.
x
=
375
;
this
.
bonusTime
.
y
=
600
;
this
.
once
(
egret
.
Event
.
ADDED_TO_STAGE
,
this
.
initMainScene
,
this
);
}
initMainScene
(){
var
stagew
=
this
.
stage
.
stageWidth
;
var
stageh
=
this
.
stage
.
stageHeight
;
var
whl
=
stagew
/
stageh
;
if
(
whl
>
0.5
){
this
.
islongScreen
=
false
;
}
else
{
this
.
islongScreen
=
true
;
}
if
(
this
.
islongScreen
){
this
[
'adapttop'
].
y
=
60
;
}
else
{
this
[
'adapttop'
].
y
=
0
;
}
//基础ui
//目标
this
.
targetContainer
=
new
egret
.
DisplayObjectContainer
;
this
.
addChild
(
this
.
targetContainer
);
this
[
'adapttop'
]
.
addChild
(
this
.
targetContainer
);
//第几关
this
.
chapterTxt
=
new
ChapterNum
();
this
.
chapterTxt
.
num
=
'0'
// >> 0;
...
...
@@ -429,15 +460,15 @@ export default class MainScene extends Scene {
this
.
stepNumber
=
new
StepNumber
();
this
.
stepNumber
.
x
=
175
;
this
.
stepNumber
.
y
=
83.5
;
this
.
addChild
(
this
.
stepNumber
);
this
[
'adapttop'
]
.
addChild
(
this
.
stepNumber
);
//当前分数
this
.
curScoreNum
=
new
CurScoreNum
();
this
.
curScoreNum
.
x
=
284
;
this
.
curScoreNum
.
y
=
170
;
this
.
addChild
(
this
.
curScoreNum
);
this
[
'adapttop'
]
.
addChild
(
this
.
curScoreNum
);
//初始换道具容器
this
.
propBtnCon
=
new
PropBtnCon
();
this
.
propBtnCon
=
new
PropBtnCon
(
this
.
islongScreen
);
this
.
addChild
(
this
.
propBtnCon
);
this
.
mapContainer
=
new
egret
.
DisplayObjectContainer
();
...
...
@@ -461,20 +492,11 @@ export default class MainScene extends Scene {
this
.
festivalContainer
=
new
egret
.
DisplayObjectContainer
();
this
.
addChildAt
(
this
.
festivalContainer
,
1
);
//选择框 无需加入场景
var
textureChoosed
:
egret
.
Texture
=
RES
.
getRes
(
"chooseRect_png"
)
this
.
choosed
=
new
eui
.
Image
(
textureChoosed
);
this
.
choosed
.
x
=
-
textureChoosed
.
textureWidth
/
2
;
this
.
choosed
.
y
=
-
textureChoosed
.
textureHeight
/
2
;
//道具使用时蒙层 无需加入场景,带入propBtnCo的位置数据
this
.
propGuide
=
new
PropGuide
(
this
.
propBtnCon
.
y
);
this
.
propGuide
.
touchEnabled
=
true
;
console
.
log
(
'偏移'
,
this
.
propBtnCon
.
y
,
this
.
propBtnCon
.
boomBtn
.
y
);
//bonusTime引导,备用的,无需加入场景
this
.
bonusTime
=
new
BonusTime
();
this
.
bonusTime
.
x
=
375
;
this
.
bonusTime
.
y
=
600
;
this
.
propGuide
=
new
PropGuide
(
this
.
propBtnCon
.
y
,
this
.
islongScreen
);
this
.
propGuide
.
touchEnabled
=
true
;
}
resetMainScene
(){
...
...
@@ -931,8 +953,9 @@ export default class MainScene extends Scene {
//当前分数
//初始换道具容器
this
.
propBtnCon
.
y
=
299
+
Tool
.
gameAreaHeight
// + 55;
this
.
propGuide
.
changeOffset
(
this
.
propBtnCon
.
y
);
var
propbtny
:
number
=
299
+
Tool
.
gameAreaHeight
// + 55;
this
.
propBtnCon
.
y
=
propbtny
;
this
.
propGuide
.
changeOffset
(
this
.
propBtnCon
.
y
,
this
.
islongScreen
);
//初始化道具信息
this
.
updateScene
();
...
...
@@ -1888,7 +1911,7 @@ export default class MainScene extends Scene {
}
//添加引导蒙层
this
.
guideContainer
.
addChild
(
this
.
propGuide
);
this
.
propGuide
.
init
(
prop
);
this
.
propGuide
.
init
(
prop
,
this
[
'adapttop'
].
y
);
//如果是炸弹或者锤子
if
(
prop
==
PropType
.
BOOM
||
prop
==
PropType
.
HAMMER
)
{
//去掉元素容器的侦听
...
...
egret/src/mapScene/MapScene.ts
View file @
54294280
...
...
@@ -133,6 +133,23 @@ export default class MapScene extends Scene {
}
}
initMapScene
(){
var
stagew
=
this
.
stage
.
stageWidth
;
var
stageh
=
this
.
stage
.
stageHeight
;
var
whl
=
stagew
/
stageh
;
if
(
whl
>
0.5
){
this
.
islongScreen
=
false
;
}
else
{
this
.
islongScreen
=
true
;
}
console
.
log
(
"手机长短屏幕适配"
,
whl
,
this
.
islongScreen
);
if
(
this
.
islongScreen
){
this
[
'adapttop'
].
y
=
50
;
this
[
'settingsx'
].
bottom
=
50
;
}
else
{
this
[
'adapttop'
].
y
=
0
;
this
[
'settingsx'
].
bottom
=
25
;
}
// console.log('initMapScene--------------');
// 添加Icon
this
.
addIcon
();
...
...
@@ -324,7 +341,7 @@ export default class MapScene extends Scene {
},
20
*
1000
);
loadFireworks
();
}
islongScreen
:
boolean
=
false
;
constructor
(
data
?){
super
();
this
.
_data
=
data
;
...
...
egret/src/something/uis/PropBtnCon.ts
View file @
54294280
...
...
@@ -8,7 +8,7 @@ export class PropBtnCon extends eui.Component {
bg
:
eui
.
Image
;
constructor
()
{
constructor
(
islongScreen
:
boolean
)
{
super
();
var
textureBg
=
RES
.
getRes
(
"propBg_png"
);
...
...
@@ -16,14 +16,21 @@ export class PropBtnCon extends eui.Component {
this
.
bg
.
y
=
-
137
;
this
.
addChild
(
this
.
bg
);
var
cuty
:
number
=
0
;
if
(
islongScreen
){
cuty
=
40
;
}
this
.
boomBtn
=
new
CusButton
(
"boomBtn_png"
);
this
.
boomBtn
.
x
=
375
-
110
-
50
;
//110图片宽度,50按钮间隔
this
.
boomBtn
.
y
=
-
cuty
;
this
.
addChild
(
this
.
boomBtn
);
this
.
hammerBtn
=
new
CusButton
(
"hammerBtn_png"
);
this
.
hammerBtn
.
x
=
375
;
this
.
hammerBtn
.
y
=
-
cuty
;
this
.
addChild
(
this
.
hammerBtn
);
this
.
stepBtn
=
new
CusButton
(
"stepBtn_png"
);
this
.
stepBtn
.
x
=
375
+
110
+
50
;
this
.
stepBtn
.
y
=
-
cuty
;
this
.
addChild
(
this
.
stepBtn
);
}
}
...
...
egret/src/something/uis/PropGuide.ts
View file @
54294280
...
...
@@ -13,21 +13,25 @@ export class PropGuide extends egret.DisplayObjectContainer {
hammerBtn
:
egret
.
Bitmap
;
stepBtn
:
egret
.
Bitmap
;
msgTxt
:
egret
.
TextField
;
constructor
(
offsetY
:
number
)
{
constructor
(
offsetY
:
number
,
islongScreen
:
boolean
)
{
super
()
this
.
bg
=
new
egret
.
Shape
();
this
.
addChild
(
this
.
bg
);
this
.
boomBtn
=
new
egret
.
Bitmap
(
RES
.
getRes
(
"boomBtn_png"
));
this
.
boomBtn
.
x
=
375
-
110
-
50
-
55
;
//110图片宽度,50按钮间隔,55一半的图片宽度
this
.
boomBtn
.
y
=
offsetY
-
55
;
var
cuty
:
number
=
0
;
if
(
islongScreen
){
cuty
=
-
100
;
}
this
.
boomBtn
.
y
=
offsetY
-
55
+
cuty
;
this
.
addChild
(
this
.
boomBtn
);
this
.
hammerBtn
=
new
egret
.
Bitmap
(
RES
.
getRes
(
"hammerBtn_png"
));
this
.
hammerBtn
.
x
=
375
-
55
;
this
.
hammerBtn
.
y
=
offsetY
-
55
;
this
.
hammerBtn
.
y
=
offsetY
-
55
+
cuty
;
this
.
addChild
(
this
.
hammerBtn
);
this
.
stepBtn
=
new
egret
.
Bitmap
(
RES
.
getRes
(
"stepBtn_png"
));
this
.
stepBtn
.
x
=
375
+
110
+
50
-
55
;
this
.
stepBtn
.
y
=
offsetY
-
55
;
this
.
stepBtn
.
y
=
offsetY
-
55
+
cuty
;
this
.
addChild
(
this
.
stepBtn
);
//再调
var
text
:
egret
.
TextField
=
new
egret
.
TextField
();
...
...
@@ -35,7 +39,7 @@ export class PropGuide extends egret.DisplayObjectContainer {
text
.
textColor
=
0xffffff
;
text
.
size
=
20
;
text
.
x
=
(
750
-
500
)
/
2
;
text
.
y
=
offsetY
-
80
;
text
.
y
=
offsetY
-
80
+
cuty
;
text
.
textAlign
=
egret
.
HorizontalAlign
.
CENTER
;
text
.
width
=
500
;
this
.
addChild
(
text
);
...
...
@@ -44,13 +48,17 @@ export class PropGuide extends egret.DisplayObjectContainer {
if
(
this
.
parent
)
this
.
parent
.
removeChild
(
this
)
},
this
)
}
changeOffset
(
offsetY
:
number
){
this
.
boomBtn
.
y
=
offsetY
-
55
;
this
.
hammerBtn
.
y
=
offsetY
-
55
;
this
.
stepBtn
.
y
=
offsetY
-
55
;
this
.
msgTxt
.
y
=
offsetY
-
80
;
changeOffset
(
offsetY
:
number
,
islongScreen
:
boolean
){
var
cuty
:
number
=
0
;
if
(
islongScreen
){
cuty
=
-
40
;
}
this
.
boomBtn
.
y
=
offsetY
-
55
+
cuty
;
this
.
hammerBtn
.
y
=
offsetY
-
55
+
cuty
;
this
.
stepBtn
.
y
=
offsetY
-
55
+
cuty
;
this
.
msgTxt
.
y
=
offsetY
-
80
+
cuty
;
}
init
(
prop
:
PropType
)
{
init
(
prop
:
PropType
,
adapttopy
:
number
)
{
if
(
prop
==
PropType
.
BOOM
)
{
this
.
boomBtn
.
visible
=
true
;
this
.
hammerBtn
.
visible
=
false
;
...
...
@@ -78,7 +86,7 @@ export class PropGuide extends egret.DisplayObjectContainer {
this
.
bg
.
graphics
.
lineTo
(
750
,
1624
);
this
.
bg
.
graphics
.
lineTo
(
0
,
1624
);
this
.
bg
.
graphics
.
lineTo
(
0
,
0
);
this
.
bg
.
graphics
.
drawArc
(
178
,
85
,
80
,
0
,
Math
.
PI
*
2
,
true
)
this
.
bg
.
graphics
.
drawArc
(
178
,
85
+
adapttopy
,
80
,
0
,
Math
.
PI
*
2
,
true
)
this
.
bg
.
graphics
.
endFill
();
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