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
970c6cf0
Commit
970c6cf0
authored
Dec 10, 2019
by
wildfirecode
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
641b4519
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
17 deletions
+42
-17
index.html
egret/index.html
+1
-2
JoinShareSkin.exml
egret/resource/skins/JoinShareSkin.exml
+4
-0
TransSkin.exml
egret/resource/skins/TransSkin.exml
+4
-0
iswx.ts
egret/src/iswx.ts
+3
-0
JoinShareScene.ts
egret/src/yazuwei/JoinShareScene.ts
+5
-3
ShareStarterScene.ts
egret/src/yazuwei/ShareStarterScene.ts
+5
-8
TransScene.ts
egret/src/yazuwei/TransScene.ts
+10
-0
pollingAnimationState.json
mock/yzw/pollingAnimationState.json
+10
-4
No files found.
egret/index.html
View file @
970c6cf0
...
...
@@ -54,9 +54,8 @@
// window['pageID'] = 'TeamShareScene';
// window['pageID'] = 'JoinShareScene';
// window['pageID'] = 'Share2Scene';
window
[
'pageID'
]
=
'TransScene'
;
window
[
'TransLink'
]
=
''
;
// window['pageID'] = 'TransScene';
window
[
'projectId'
]
=
"1"
;
window
[
'playwayId'
]
=
"join_1"
;
window
[
"appId"
]
=
""
;
...
...
egret/resource/skins/JoinShareSkin.exml
View file @
970c6cf0
...
...
@@ -4,4 +4,8 @@
<e:Image
source=
"joinshare_bg_jpg"
scaleX=
"1"
scaleY=
"1"
/>
<e:Image
id=
"btn"
source=
"joinshare_btn_png"
y=
"797"
horizontalCenter=
"0"
x=
"192.21"
scaleX=
"1"
scaleY=
"1"
/>
</e:Group>
<e:Group
id=
"sharemask"
x=
"0"
y=
"0"
visible=
"false"
>
<e:Rect
id=
"rect0"
width=
"750"
height=
"1624"
x=
"0"
y=
"0"
fillAlpha=
"0.7"
/>
<e:Image
id=
"cover0"
source=
"share2mask_png"
x=
"177"
y=
"73"
/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TransSkin.exml
View file @
970c6cf0
...
...
@@ -8,4 +8,8 @@
<e:Image
id=
"title"
source=
"transfer _title_png"
y=
"335"
x=
"54"
/>
</e:Group>
<e:Image
id=
"btn"
source=
"transfer _btn_png"
x=
"179"
bottom=
"93"
/>
<e:Group
id=
"sharemask"
x=
"0"
y=
"0"
visible=
"false"
>
<e:Rect
id=
"rect1"
width=
"750"
height=
"1624"
x=
"0"
y=
"0"
fillAlpha=
"0.7"
/>
<e:Image
id=
"cover1"
source=
"share2mask_png"
x=
"177"
y=
"73"
/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/src/iswx.ts
0 → 100644
View file @
970c6cf0
export
default
()
=>
{
return
navigator
.
userAgent
.
toLowerCase
().
indexOf
(
'micromessenger'
)
!==
-
1
}
\ No newline at end of file
egret/src/yazuwei/JoinShareScene.ts
View file @
970c6cf0
...
...
@@ -2,9 +2,7 @@ import Scene from "../views/Scene";
import
PanelCtrl
from
"../ctrls/panelCtrl"
;
import
{
ModuleTypes
}
from
"../types/sceneTypes"
;
import
GameConst
from
"../GameConst"
;
const
iswx
=
()
=>
{
return
navigator
.
userAgent
.
toLowerCase
().
indexOf
(
'micromessenger'
)
!==
-
1
}
import
iswx
from
"../iswx"
;
export
default
class
JoinShareScene
extends
Scene
{
protected
get
skinKey
()
{
return
'JoinShare'
}
...
...
@@ -22,6 +20,10 @@ export default class JoinShareScene extends Scene {
onTap_btn
()
{
console
.
log
(
'onTap_btn'
);
if
(
iswx
())
{
this
[
'sharemask'
].
visible
=
true
;
this
[
'sharemask'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
this
[
'sharemask'
].
visible
=
false
;
},
this
);
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
ConfirmPanel
);
...
...
egret/src/yazuwei/ShareStarterScene.ts
View file @
970c6cf0
...
...
@@ -74,10 +74,7 @@ export default class ShareStarterScene extends Scene {
this
[
'tipsWrapper'
].
visible
=
true
;
this
[
'transbtn'
].
visible
=
true
;
// const data = DataManager.ins.getData('accept').data;
// data.from = 'ShareStarterScene';
// SceneCtrl.instance.change(ModuleTypes.CertificateScene, data);
const
data
:
any
=
{}
const
data
=
DataManager
.
ins
.
getData
(
'yyh_pollingAnimationState'
).
data
;
data
.
from
=
'ShareStarterScene'
;
SceneCtrl
.
instance
.
change
(
ModuleTypes
.
CertificateScene
,
data
);
},
this
);
...
...
@@ -105,7 +102,7 @@ export default class ShareStarterScene extends Scene {
this
[
'matchingTips'
].
visible
=
true
;
NetManager
.
ins
.
yyh_pollingAnimationState
((
success
)
=>
{
const
data
=
DataManager
.
ins
.
getData
(
'yyh_pollingAnimationState'
).
data
;
if
(
data
==
3
)
{
//摇一摇
if
(
data
.
state
==
3
)
{
//摇一摇
this
.
changeToTrans
();
this
[
'waitTips'
].
visible
=
false
;
this
[
'matchingTips'
].
visible
=
false
;
...
...
@@ -113,14 +110,14 @@ export default class ShareStarterScene extends Scene {
}
},
sharecode
,
()
=>
{
const
data
=
DataManager
.
ins
.
getData
(
'yyh_pollingAnimationState'
).
data
;
if
(
data
==
1
)
{
//被邀请者确认邀请
if
(
data
.
state
==
1
)
{
//被邀请者确认邀请
this
[
'waitTips'
].
visible
=
true
;
this
[
'matchingTips'
].
visible
=
false
;
}
if
(
data
==
2
)
{
//用户取消
if
(
data
.
state
==
2
)
{
//用户取消
//暂时无法取消
}
return
data
===
null
||
data
==
0
||
data
==
1
||
data
==
2
;
return
data
.
state
===
null
||
data
.
state
==
0
||
data
.
state
==
1
||
data
.
state
==
2
;
})
},
window
[
'projectId'
])
}
...
...
egret/src/yazuwei/TransScene.ts
View file @
970c6cf0
...
...
@@ -8,6 +8,7 @@ import { yzwNet } from "../NetConst";
import
SceneCtrl
from
"../ctrls/sceneCtrl"
;
import
{
ModuleTypes
}
from
"../types/sceneTypes"
;
import
PanelCtrl
from
"../ctrls/panelCtrl"
;
import
iswx
from
"../iswx"
;
export
default
class
TransScene
extends
Scene
{
_bg
:
SVGA
.
EgretMovieClip
;
...
...
@@ -128,6 +129,15 @@ export default class TransScene extends Scene {
}
onTap_btn
()
{
if
(
iswx
())
{
this
[
'sharemask'
].
visible
=
true
;
this
[
'sharemask'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
this
[
'sharemask'
].
visible
=
false
;
},
this
);
return
;
}
this
[
'title'
].
visible
=
false
;
this
[
'btn'
].
visible
=
false
;
console
.
log
(
'onTap_btn'
);
...
...
mock/yzw/pollingAnimationState.json
View file @
970c6cf0
{
"code"
:
null
,
"data"
:
3
,
"message"
:
null
,
"success"
:
true
"code"
:
null
,
"data"
:
{
"inviterUserId"
:
"500412018"
,
"inviteeUserId"
:
"500412019"
,
"state"
:
"3"
,
"inviterPhone"
:
123
,
"inviteePhone"
:
456
},
"message"
:
null
,
"success"
:
true
}
\ No newline at end of file
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