Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Y
yyh
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
yyh
Commits
d95b134d
Commit
d95b134d
authored
Dec 10, 2019
by
wildfirecode
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab2.dui88.com/wanghongyuan/yyh
into dev
parents
fdb22131
acc60b4a
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
71 additions
and
57 deletions
+71
-57
Delay_3.tmproject
egret/resource/TextureMerger/Delay_3.tmproject
+1
-1
Garbage_2.tmproject
egret/resource/TextureMerger/Garbage_2.tmproject
+1
-1
Preload_0.tmproject
egret/resource/TextureMerger/Preload_0.tmproject
+1
-1
PKSCoreSkin.exml
egret/resource/skins/PKSCoreSkin.exml
+18
-18
StartScene.ts
egret/src/startScene/StartScene.ts
+11
-0
PKScene.ts
egret/src/yazuwei/PKScene.ts
+11
-1
PKScorePanel.ts
egret/src/yazuwei/PKScorePanel.ts
+10
-1
PlacePanel.ts
egret/src/yazuwei/PlacePanel.ts
+2
-0
RecordMapScene.ts
egret/src/yazuwei/RecordMapScene.ts
+3
-0
RecordScene.ts
egret/src/yazuwei/RecordScene.ts
+3
-0
getProjectUserInfo.json
mock/getProjectUserInfo.json
+1
-1
getPkBaseInfo.json
mock/yzw/getPkBaseInfo.json
+2
-29
homeBaseInfo.json
mock/yzw/homeBaseInfo.json
+7
-4
No files found.
egret/resource/TextureMerger/Delay_3.tmproject
View file @
d95b134d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delay_3","version":5,"files":["../assets/pk/box.png","../assets/pk/head1.png","../assets/pk/pkadd.png","../assets/pk/pkagainBtn.png","../assets/pk/pkaskBtn.png","../assets/pk/pkBtn.png","../assets/pk/pkcirle.png","../assets/pk/pkendbg.png","../assets/pk/pkloselight.png","../assets/pk/pkloselogo.png","../assets/pk/pkmyline2.png","../assets/pk/pknoton.png","../assets/pk/pkotherline2.png","../assets/pk/pkpeacelight.png","../assets/pk/pkpeacelogo.png","../assets/pk/pkprizebg.png","../assets/pk/pkprizeBtn.png","../assets/pk/pkrulebg.png","../assets/pk/pkrulebtn.png","../assets/pk/pkscorebg.png","../assets/pk/pkscorebg2.png","../assets/pk/pkwinbg.png","../assets/pk/pkwinBtn.png","../assets/pk/pkwinlight.png","../assets/pk/pkwinlogo.png","../assets/guide/ydline.png","../assets/guide/ydlight2.png","../assets/guide/ydlight.png","../assets/guide/hand2.png","../assets/guide/hand.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delay_3","version":5,"files":["..\\assets\\pk\\box.png","..\\assets\\pk\\head1.png","..\\assets\\pk\\pkadd.png","..\\assets\\pk\\pkagainBtn.png","..\\assets\\pk\\pkaskBtn.png","..\\assets\\pk\\pkBtn.png","..\\assets\\pk\\pkcirle.png","..\\assets\\pk\\pkendbg.png","..\\assets\\pk\\pkloselight.png","..\\assets\\pk\\pkloselogo.png","..\\assets\\pk\\pkmyline2.png","..\\assets\\pk\\pknoton.png","..\\assets\\pk\\pkotherline2.png","..\\assets\\pk\\pkpeacelight.png","..\\assets\\pk\\pkpeacelogo.png","..\\assets\\pk\\pkprizebg.png","..\\assets\\pk\\pkprizeBtn.png","..\\assets\\pk\\pkrulebg.png","..\\assets\\pk\\pkrulebtn.png","..\\assets\\pk\\pkscorebg.png","..\\assets\\pk\\pkscorebg2.png","..\\assets\\pk\\pkwinbg.png","..\\assets\\pk\\pkwinBtn.png","..\\assets\\pk\\pkwinlight.png","..\\assets\\pk\\pkwinlogo.png","..\\assets\\guide\\ydline.png","..\\assets\\guide\\ydlight2.png","..\\assets\\guide\\ydlight.png","..\\assets\\guide\\hand2.png","..\\assets\\guide\\hand.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Garbage_2.tmproject
View file @
d95b134d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_2","version":5,"files":["../assets/share2/share2mask.png","../assets/share2/share2btn.png","../assets/sharestarter/sharestarter_sharebtn.png","../assets/sharestarter/sharestarter_btn.png","../assets/joinshare/joinshare_btn.png","../assets/certificate/certificate_btn.png","../assets/certificate/certificate_cover.png","../assets/slogan/slogan_btn.png","../assets/slogan/slogan_bg.png","../assets/teamshare/teamshare_btn.png","../assets/transfer/transfer _toast3.png","../assets/transfer/transfer _toast2.png","../assets/transfer/transfer _toast1.png","../assets/transfer/transfer _title.png","../assets/transfer/transfer _btn.png","../assets/transferrecord/transferrecord_item_bg.png","../assets/transferrecord/transferrecord_bg.png","../assets/confirm/confirm_bg.png","../assets/confirm/confirm_btn.png","../assets/common/关闭按钮 .png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_2","version":5,"files":["..\\assets\\share2\\share2mask.png","..\\assets\\share2\\share2btn.png","..\\assets\\sharestarter\\sharestarter_sharebtn.png","..\\assets\\sharestarter\\sharestarter_btn.png","..\\assets\\joinshare\\joinshare_btn.png","..\\assets\\certificate\\certificate_btn.png","..\\assets\\certificate\\certificate_cover.png","..\\assets\\slogan\\slogan_btn.png","..\\assets\\slogan\\slogan_bg.png","..\\assets\\teamshare\\teamshare_btn.png","..\\assets\\transfer\\transfer _toast3.png","..\\assets\\transfer\\transfer _toast2.png","..\\assets\\transfer\\transfer _toast1.png","..\\assets\\transfer\\transfer _title.png","..\\assets\\transfer\\transfer _btn.png","..\\assets\\transferrecord\\transferrecord_item_bg.png","..\\assets\\transferrecord\\transferrecord_bg.png","..\\assets\\confirm\\confirm_bg.png","..\\assets\\confirm\\confirm_btn.png","..\\assets\\common\\关闭按钮 .png"]}
\ No newline at end of file
egret/resource/TextureMerger/Preload_0.tmproject
View file @
d95b134d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Preload_0","version":5,"files":["../assets/startScene/yylogo.png","../assets/startScene/yyhpklogo.png","../assets/startScene/yyhlogo.png","../assets/startScene/waitBtn.png","../assets/startScene/unriben.png","../assets/startScene/unmenggu.png","../assets/startScene/unhanguo.png","../assets/startScene/unCHNxianggang.png","../assets/startScene/unCHNtaiwan.png","../assets/startScene/unCHNhangzhou.png","../assets/startScene/unCHNaomen.png","../assets/startScene/unchaoxian.png","../assets/startScene/teamBtn.png","../assets/startScene/starttitle.png","../assets/startScene/startBtn.png","../assets/startScene/ruleBtn.png","../assets/startScene/riben.png","../assets/startScene/recordBtn.png","../assets/startScene/rankBtn.png","../assets/startScene/prizeBtn.png","../assets/startScene/menggu.png","../assets/startScene/lockBtn.png","../assets/startScene/littletitle.png","../assets/startScene/horn.png","../assets/startScene/hanguo.png","../assets/startScene/getBtn.png","../assets/startScene/fireBtn.png","../assets/startScene/CHNxianggang.png","../assets/startScene/CHNtaiwan.png","../assets/startScene/CHNhangzhou.png","../assets/startScene/CHNaomen.png","../assets/startScene/chaoxian.png","../assets/startScene/closeBtn.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Preload_0","version":5,"files":["..\\assets\\startScene\\yylogo.png","..\\assets\\startScene\\yyhpklogo.png","..\\assets\\startScene\\yyhlogo.png","..\\assets\\startScene\\waitBtn.png","..\\assets\\startScene\\unriben.png","..\\assets\\startScene\\unmenggu.png","..\\assets\\startScene\\unhanguo.png","..\\assets\\startScene\\unCHNxianggang.png","..\\assets\\startScene\\unCHNtaiwan.png","..\\assets\\startScene\\unCHNhangzhou.png","..\\assets\\startScene\\unCHNaomen.png","..\\assets\\startScene\\unchaoxian.png","..\\assets\\startScene\\teamBtn.png","..\\assets\\startScene\\starttitle.png","..\\assets\\startScene\\startBtn.png","..\\assets\\startScene\\ruleBtn.png","..\\assets\\startScene\\riben.png","..\\assets\\startScene\\recordBtn.png","..\\assets\\startScene\\rankBtn.png","..\\assets\\startScene\\prizeBtn.png","..\\assets\\startScene\\menggu.png","..\\assets\\startScene\\lockBtn.png","..\\assets\\startScene\\littletitle.png","..\\assets\\startScene\\horn.png","..\\assets\\startScene\\hanguo.png","..\\assets\\startScene\\getBtn.png","..\\assets\\startScene\\fireBtn.png","..\\assets\\startScene\\CHNxianggang.png","..\\assets\\startScene\\CHNtaiwan.png","..\\assets\\startScene\\CHNhangzhou.png","..\\assets\\startScene\\CHNaomen.png","..\\assets\\startScene\\chaoxian.png","..\\assets\\startScene\\closeBtn.png"]}
\ No newline at end of file
egret/resource/skins/PKSCoreSkin.exml
View file @
d95b134d
...
...
@@ -2,23 +2,23 @@
<e:Skin
class=
"PKScoreSkin"
width=
"750"
height=
"1624"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<w:Config
id=
"16eeaea9839"
/>
<e:Group
width=
"750"
height=
"
1206"
horizontalCenter=
"0"
verticalCenter=
"-209
"
>
<e:Image
id=
"light"
width=
"693"
height=
"689"
x=
"27"
y=
"
243"
source=
"pkwinlight_png
"
/>
<e:Image
width=
"638"
height=
"673"
x=
"57"
y=
"
441"
source=
"pkendbg_png
"
/>
<e:Button
id=
"closeBtn"
label=
"Button"
skinName=
"ui.IconButtonSkin"
icon=
"closeBtn_png"
width=
"48"
height=
"48"
anchorOffsetX=
"24"
anchorOffsetY=
"24"
x=
"6
97"
y=
"376
"
/>
<e:Image
id=
"box"
width=
"61"
height=
"54"
x=
"340"
y=
"
574"
source=
"box_png
"
/>
<e:Label
id=
"date"
text=
"12月5日"
x=
"293"
y=
"
547"
size=
"18"
width=
"166"
textAlign=
"center
"
/>
<e:Label
id=
"title"
text=
"宝箱已发到胜利队伍"
x=
"310"
y=
"
634"
size=
"14"
width=
"136"
textAlign=
"center
"
/>
<e:Image
id=
"status"
width=
"84"
height=
"98"
x=
"486"
y=
"
563"
source=
"pkwinlogo_png
"
/>
<e:Button
id=
"prizeBtn"
label=
"Button"
skinName=
"ui.IconButtonSkin"
icon=
"pkwinBtn_png"
width=
"291"
height=
"82"
anchorOffsetX=
"145.5"
anchorOffsetY=
"41"
x=
"375.5"
y=
"1017
"
/>
<e:Label
id=
"myscore"
text=
"9999"
x=
"248"
y=
"
679"
textColor=
"0x4cfcfc"
size=
"28
"
/>
<e:Label
id=
"otherscore"
text=
"7000"
x=
"509"
y=
"
679"
textColor=
"0x4cfcfc"
size=
"28
"
/>
<e:Label
id=
"endtitle"
text=
"本场分数奖励"
x=
"57"
y=
"
789
"
width=
"638"
textAlign=
"center"
scaleX=
"1"
scaleY=
"1"
/>
<e:Component
id=
"team1"
x=
"111"
y=
"
836
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Component
id=
"team2"
x=
"222"
y=
"
836
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Component
id=
"team3"
x=
"333"
y=
"
836
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Component
id=
"team4"
x=
"444"
y=
"
836
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Component
id=
"team5"
x=
"555"
y=
"
836
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Image
width=
"110"
height=
"65"
x=
"151"
y=
"
581
"
source=
"yyhpklogo_png"
scaleX=
"1"
scaleY=
"1"
/>
<e:Group
width=
"750"
height=
"
872"
anchorOffsetY=
"0"
horizontalCenter=
"0"
verticalCenter=
"-133
"
>
<e:Image
id=
"light"
width=
"693"
height=
"689"
x=
"27"
y=
"
0"
source=
"pkwinlight_png"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Image
width=
"638"
height=
"673"
x=
"57"
y=
"
198"
source=
"pkendbg_png"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Button
id=
"closeBtn"
label=
"Button"
skinName=
"ui.IconButtonSkin"
icon=
"closeBtn_png"
width=
"48"
height=
"48"
anchorOffsetX=
"24"
anchorOffsetY=
"24"
x=
"6
73"
y=
"109"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Image
id=
"box"
width=
"61"
height=
"54"
x=
"340"
y=
"
331"
source=
"box_png"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Label
id=
"date"
text=
"12月5日"
x=
"293"
y=
"
304"
size=
"18"
width=
"166"
textAlign=
"center"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Label
id=
"title"
text=
"宝箱已发到胜利队伍"
x=
"310"
y=
"
391"
size=
"14"
width=
"136"
textAlign=
"center"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Image
id=
"status"
width=
"84"
height=
"98"
x=
"486"
y=
"
320"
source=
"pkwinlogo_png"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Button
id=
"prizeBtn"
label=
"Button"
skinName=
"ui.IconButtonSkin"
icon=
"pkwinBtn_png"
width=
"291"
height=
"82"
anchorOffsetX=
"145.5"
anchorOffsetY=
"41"
y=
"766"
scaleX=
"1"
scaleY=
"1"
horizontalCenter=
"0.5
"
/>
<e:Label
id=
"myscore"
text=
"9999"
x=
"248"
y=
"
436"
textColor=
"0x4cfcfc"
size=
"28"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Label
id=
"otherscore"
text=
"7000"
x=
"509"
y=
"
436"
textColor=
"0x4cfcfc"
size=
"28"
scaleX=
"1"
scaleY=
"1
"
/>
<e:Label
id=
"endtitle"
text=
"本场分数奖励"
x=
"57"
y=
"
546
"
width=
"638"
textAlign=
"center"
scaleX=
"1"
scaleY=
"1"
/>
<e:Component
id=
"team1"
x=
"111"
y=
"
593
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Component
id=
"team2"
x=
"222"
y=
"
593
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Component
id=
"team3"
x=
"333"
y=
"
593
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Component
id=
"team4"
x=
"444"
y=
"
593
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Component
id=
"team5"
x=
"555"
y=
"
593
"
skinName=
"HeadItemSkin"
scaleX=
"0.68"
scaleY=
"0.68"
/>
<e:Image
width=
"110"
height=
"65"
x=
"151"
y=
"
338
"
source=
"yyhpklogo_png"
scaleX=
"1"
scaleY=
"1"
/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/src/startScene/StartScene.ts
View file @
d95b134d
...
...
@@ -6,6 +6,7 @@ import { yzwNet } from "../NetConst";
import
ToastCtrl
from
"../ctrls/toastCtrl"
;
import
{
DataManager
}
from
"../../libs/tw/manager/DataManager"
;
import
SceneCtrl
from
"../ctrls/sceneCtrl"
;
import
Waiting
from
"../waiting/Waiting"
;
export
default
class
StartScene
extends
Scene
{
...
...
@@ -189,6 +190,7 @@ export default class StartScene extends Scene {
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
GUIDE_PANEL
,
data
);
}
GuideFive
(){
Waiting
.
instance
.
show
();
yzwNet
.
doStart
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"doStart"
).
message
)
...
...
@@ -197,6 +199,7 @@ export default class StartScene extends Scene {
}
yzwNet
.
unlockArea
((
ss
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
ss
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"unlockArea"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
...
...
@@ -217,7 +220,9 @@ export default class StartScene extends Scene {
}
onTap_rankBtn
(){
Waiting
.
instance
.
show
();
yzwNet
.
rankInfo
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"rankInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
...
...
@@ -235,6 +240,7 @@ export default class StartScene extends Scene {
}
unlockArea
(){
if
(
this
.
level
==
0
){
Waiting
.
instance
.
show
();
yzwNet
.
doStart
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"doStart"
).
message
)
...
...
@@ -242,6 +248,7 @@ export default class StartScene extends Scene {
return
;
}
yzwNet
.
unlockArea
((
ss
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
ss
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"unlockArea"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
...
...
@@ -260,7 +267,9 @@ export default class StartScene extends Scene {
},
window
[
'projectId'
])
}
else
{
Waiting
.
instance
.
show
();
yzwNet
.
unlockArea
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"unlockArea"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
...
...
@@ -286,7 +295,9 @@ export default class StartScene extends Scene {
SceneCtrl
.
instance
.
change
(
ModuleTypes
.
ShareStarterScene
);
}
onTap_PKBtn
(){
Waiting
.
instance
.
show
();
yzwNet
.
getPkBaseInfo
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"getPkBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
...
...
egret/src/yazuwei/PKScene.ts
View file @
d95b134d
...
...
@@ -6,6 +6,7 @@ import ToastCtrl from "../ctrls/toastCtrl";
import
{
DataManager
}
from
"../../libs/tw/manager/DataManager"
;
import
{
NetManager
}
from
"../../libs/tw/manager/NetManager"
;
import
GameConst
from
"../GameConst"
;
import
Waiting
from
"../waiting/Waiting"
;
export
default
class
PKScene
extends
Scene
{
protected
get
skinKey
(){
return
'PK'
}
...
...
@@ -47,6 +48,7 @@ export default class PKScene extends Scene{
}
}
initUI
(
data
){
console
.
log
(
"pk:"
+
data
)
this
.
once
(
egret
.
Event
.
ADDED_TO_STAGE
,
()
=>
{
this
.
height
=
this
.
stage
.
stageHeight
;
},
this
);
...
...
@@ -124,7 +126,7 @@ export default class PKScene extends Scene{
this
.
onTap
(
this
[
"team"
+
i
][
"notonBtn"
],
this
.
askOnline
);
}
if
(
data
.
myTeamMembers
[
i
-
1
].
consumerId
==
uiddata
.
consum
erId
){
if
(
data
.
myTeamMembers
[
i
-
1
].
uId
==
uiddata
.
partnerUs
erId
){
this
[
"team"
+
i
][
"onphone"
].
text
=
"我"
}
...
...
@@ -163,7 +165,9 @@ export default class PKScene extends Scene{
this
.
onTap
(
this
.
ruleBtn
,()
=>
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PKRULE_PANEL
)});
}
onTap_OpenBox
(){
Waiting
.
instance
.
show
();
yzwNet
.
getTreasureBox
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
return
...
...
@@ -188,7 +192,9 @@ export default class PKScene extends Scene{
}
addTeam
(){
Waiting
.
instance
.
show
();
yzwNet
.
genInvite
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"genInvite"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~")
...
...
@@ -200,7 +206,9 @@ export default class PKScene extends Scene{
// window['share']();
}
askTeam
(){
Waiting
.
instance
.
show
();
yzwNet
.
genInvite
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"genInvite"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~")
...
...
@@ -212,7 +220,9 @@ export default class PKScene extends Scene{
// window['share']();
}
askOnline
(){
Waiting
.
instance
.
show
();
yzwNet
.
genInvite
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"genInvite"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~")
...
...
egret/src/yazuwei/PKScorePanel.ts
View file @
d95b134d
...
...
@@ -5,6 +5,7 @@ import ToastCtrl from "../ctrls/toastCtrl";
import
SceneCtrl
from
"../ctrls/sceneCtrl"
;
import
{
ModuleTypes
}
from
"../types/sceneTypes"
;
import
{
NetManager
}
from
"../../libs/tw/manager/NetManager"
;
import
Waiting
from
"../waiting/Waiting"
;
export
default
class
PKScorePanel
extends
Panel
{
protected
get
skinKey
(){
return
'PKScore'
}
...
...
@@ -39,6 +40,11 @@ export default class PKScorePanel extends Panel{
if
(
data
.
pkResult
.
pkResult
==
0
){
//pk结果 0 失败,1 获胜,2 平局
this
.
status
.
source
=
"pkpeacelogo_png"
this
.
light
.
source
=
"pkpeacelight_png"
this
.
status
.
x
=
486
this
.
status
.
y
=
329
this
.
status
.
width
=
83
this
.
status
.
height
=
81
this
.
title
.
text
=
"未能获得宝箱"
this
.
endtitle
.
text
=
"本场助力排行榜"
this
.
setColor
(
this
.
box
);
...
...
@@ -69,10 +75,11 @@ export default class PKScorePanel extends Panel{
}
else
if
(
data
.
pkResult
.
pkResult
==
1
){
this
[
"team"
+
(
i
+
1
)][
"onnum"
].
text
=
data
.
pkResult
.
myTeamMembers
[
i
].
score
}
else
if
(
data
.
pkResult
.
pkResult
==
2
){
this
[
"team"
+
(
i
+
1
)][
"onnum"
].
text
=
data
.
pkResult
.
myTeamMembers
[
i
].
steps
}
this
[
"team"
+
(
i
+
1
)][
"headimg"
].
source
=
data
.
pkResult
.
myTeamMembers
[
i
].
avatar
;
if
(
data
.
pkResult
.
myTeamMembers
[
i
].
u
id
==
uiddata
.
consum
erId
){
if
(
data
.
pkResult
.
myTeamMembers
[
i
].
u
Id
==
uiddata
.
partnerUs
erId
){
this
[
"team"
+
(
i
+
1
)][
"onphone"
].
text
=
"我"
}
else
{
if
(
data
.
pkResult
.
myTeamMembers
[
i
].
phone
){
...
...
@@ -98,7 +105,9 @@ export default class PKScorePanel extends Panel{
}
onTap_PKBtn
(){
Waiting
.
instance
.
show
();
yzwNet
.
getPkBaseInfo
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"getPkBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
...
...
egret/src/yazuwei/PlacePanel.ts
View file @
d95b134d
...
...
@@ -44,7 +44,9 @@ export default class PlacePanel extends Panel{
}
backStart
(){
Waiting
.
instance
.
show
();
yzwNet
.
homeBaseInfo
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
...
...
egret/src/yazuwei/RecordMapScene.ts
View file @
d95b134d
...
...
@@ -2,6 +2,7 @@ import Scene from "../views/Scene";
import
{
yzwNet
}
from
"../NetConst"
;
import
ToastCtrl
from
"../ctrls/toastCtrl"
;
import
{
DataManager
}
from
"../../libs/tw/manager/DataManager"
;
import
Waiting
from
"../waiting/Waiting"
;
export
default
class
RecordMapScene
extends
Scene
{
protected
get
skinKey
(){
return
'RecordMap'
}
...
...
@@ -56,8 +57,10 @@ export default class RecordMapScene extends Scene{
}
sharePic
(){
Waiting
.
instance
.
show
();
const
arr
=
[
"HZ"
,
"AM"
,
"XG"
,
"TB"
,
"RB"
,
"HG"
,
"CX"
,
"MG"
];
yzwNet
.
shareFootprint
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"shareFootprint"
).
message
)
// ToastCtrl.instance.show("网络异常请重新分享~")
...
...
egret/src/yazuwei/RecordScene.ts
View file @
d95b134d
...
...
@@ -4,6 +4,7 @@ import { ModuleTypes } from "../types/sceneTypes";
import
{
yzwNet
}
from
"../NetConst"
;
import
ToastCtrl
from
"../ctrls/toastCtrl"
;
import
{
DataManager
}
from
"../../libs/tw/manager/DataManager"
;
import
Waiting
from
"../waiting/Waiting"
;
export
default
class
RecordScene
extends
Scene
{
...
...
@@ -46,7 +47,9 @@ export default class RecordScene extends Scene{
}
showMap
(
num
){
Waiting
.
instance
.
show
();
yzwNet
.
shareFootprintList
((
s
)
=>
{
Waiting
.
instance
.
hide
();
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"shareFootprintList"
).
message
)
// ToastCtrl.instance.show("网路异常请重试~");
...
...
mock/getProjectUserInfo.json
View file @
d95b134d
...
...
@@ -8,7 +8,7 @@
"credits"
:
"999"
,
"unitName"
:
"金币"
,
"consumerId"
:
500409031
,
"partnerUserId"
:
"
208812345678929
"
,
"partnerUserId"
:
"
10000
"
,
"consumerCredits"
:
9990
,
"loginJs"
:
"<script>window.requirelogin=function(){
\n
var ua = navigator.userAgent.toLowerCase();
\n
if(ua.match(/iphone/ig) || ua.match(/ipad/ig)){
\n
document.location='objc://duiba/login';
\n
}
\n
else if(ua.match(/android/ig)){
\n
try{
\n
duiba_app.login();
\n
}catch(e){}
\n
}
\n
}</script>"
}
...
...
mock/yzw/getPkBaseInfo.json
View file @
d95b134d
...
...
@@ -10,37 +10,10 @@
"consumerId"
:
"1539361"
,
"id"
:
678
,
"memberStepCounts"
:
0
,
"onlineTime"
:
"2019-12-
09
"
,
"onlineTime"
:
"2019-12-
10
"
,
"phone"
:
"189****6789"
,
"teamId"
:
"1"
,
"uId"
:
"1"
,
"avatar"
:
"https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
},{
"consumerId"
:
"1539361"
,
"id"
:
678
,
"memberStepCounts"
:
0
,
"onlineTime"
:
"2019-12-09"
,
"phone"
:
"189****6789"
,
"teamId"
:
"1"
,
"uId"
:
"1"
,
"avatar"
:
"//yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
},{
"consumerId"
:
"1539361"
,
"id"
:
678
,
"memberStepCounts"
:
0
,
"onlineTime"
:
"2019-12-09"
,
"phone"
:
"189****6789"
,
"teamId"
:
"1"
,
"uId"
:
"1"
,
"avatar"
:
"https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
},{
"consumerId"
:
"1539361"
,
"id"
:
678
,
"memberStepCounts"
:
0
,
"onlineTime"
:
"2019-12-09"
,
"phone"
:
"189****6789"
,
"teamId"
:
"1"
,
"uId"
:
"1"
,
"uId"
:
"10000"
,
"avatar"
:
"https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
}]
...
...
mock/yzw/homeBaseInfo.json
View file @
d95b134d
{
"code"
:
null
,
"data"
:{
"currentLevel"
:
0
,
"currentLevel"
:
7
,
"treasureBoxNum"
:
0
,
"currentScore"
:
1222
,
"pkResult"
:{
...
...
@@ -13,19 +13,22 @@
"steps"
:
122
,
"phone"
:
182677888
,
"score"
:
10
,
"myFlag"
:
0
"myFlag"
:
0
,
"uid"
:
10000
},
{
"steps"
:
122
,
"phone"
:
182677888
,
"score"
:
10
,
"myFlag"
:
1
"myFlag"
:
1
,
"uid"
:
100100
},
{
"steps"
:
122
,
"phone"
:
182677888
,
"score"
:
10
,
"myFlag"
:
1
"myFlag"
:
1
,
"uid"
:
100100
}
]
},
...
...
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