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
39f82ff4
Commit
39f82ff4
authored
Oct 14, 2019
by
邱旭
Browse files
Options
Browse Files
Download
Plain Diff
1
parents
c281b52a
33faef29
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
5 deletions
+26
-5
NetManager.ts
egret/libs/tw/manager/NetManager.ts
+3
-1
invitecuttimepanel.tmproject
egret/resource/TextureMerger/invitecuttimepanel.tmproject
+1
-0
inviteprizepanel.tmproject
egret/resource/TextureMerger/inviteprizepanel.tmproject
+1
-0
inviterulepanel.tmproject
egret/resource/TextureMerger/inviterulepanel.tmproject
+1
-0
default.res.json
egret/resource/default.res.json
+13
-1
InvitePrizePanelSkin.exml
egret/resource/skins/InvitePrizePanelSkin.exml
+1
-2
InviteSkin.exml
egret/resource/skins/InviteSkin.exml
+1
-1
MapScene.ts
egret/src/mapScene/MapScene.ts
+5
-0
No files found.
egret/libs/tw/manager/NetManager.ts
View file @
39f82ff4
...
...
@@ -1967,7 +1967,7 @@ export class NetManager extends ABNetManager {
const
net
:
INetData
=
{
name
:
NetName
.
DO_HELP
,
uri
:
'/customActivity/happyclear/doHelp'
,
type
:
'
pos
t'
,
type
:
'
ge
t'
,
dataType
:
'json'
,
param
:
{
activityId
:
DataManager
.
ins
.
customCfgData
.
actId
,
...
...
@@ -2022,6 +2022,8 @@ export class NetManager extends ABNetManager {
type
:
'get'
,
dataType
:
'json'
,
param
:
{
detect
:
window
[
'detect'
],
deviceSessionId
:
window
[
'_device_session_id'
],
activityId
:
DataManager
.
ins
.
customCfgData
.
actId
,
},
callback
:
callback
...
...
egret/resource/TextureMerger/invitecuttimepanel.tmproject
0 → 100644
View file @
39f82ff4
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invitecuttimepanel","version":5,"files":["../assets/invite/cutTime/invateCut_btn.png","../assets/invite/cutTime/invateCut_bg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/inviteprizepanel.tmproject
0 → 100644
View file @
39f82ff4
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"inviteprizepanel","version":5,"files":["../assets/invite/prize/invitePrize_game_btn.png","../assets/invite/prize/invitePrize_btn.png","../assets/invite/prize/invitePrize_bg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/inviterulepanel.tmproject
0 → 100644
View file @
39f82ff4
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"inviterulepanel","version":5,"files":["../assets/invite/rule/invite_rule_bg.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @
39f82ff4
...
...
@@ -89,7 +89,7 @@
"name"
:
"friend"
},
{
"keys"
:
"invite_invite_png,invite_help_png,invite_btn_png,invite_bg_png,invitePrize_btn_png,invitePrize_bg_png,invitePrize_game_btn_png,invateCut_bg_png,invateCut_btn_png,invite_wx_tip_png"
,
"keys"
:
"invite_invite_png,invite_help_png,invite_btn_png,invite_bg_png,invitePrize_btn_png,invitePrize_bg_png,invitePrize_game_btn_png,invateCut_bg_png,invateCut_btn_png,invite_wx_tip_png
,invite_rule_bg_png
"
,
"name"
:
"invite"
},
{
...
...
@@ -107,6 +107,18 @@
{
"keys"
:
"ad_closebtn_png"
,
"name"
:
"ad"
},
{
"keys"
:
"invitePrize_game_btn_png,invitePrize_btn_png,invitePrize_bg_png"
,
"name"
:
"inviteprizepanel"
},
{
"keys"
:
"invite_rule_bg_png"
,
"name"
:
"inviterulepanel"
},
{
"keys"
:
"invateCut_btn_png,invateCut_bg_png"
,
"name"
:
"invitecuttimepanel"
}
],
"resources"
:
[
...
...
egret/resource/skins/InvitePrizePanelSkin.exml
View file @
39f82ff4
...
...
@@ -2,7 +2,7 @@
<e:Skin
class=
"InviteSkin"
width=
"750"
height=
"1206"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Image
y=
"45.33"
horizontalCenter=
"0"
source=
"invitePrize_bg_png"
/>
<e:Image
id=
"prizeImg"
y=
"426.77"
source=
""
horizontalCenter=
"0"
/>
<e:Image
id=
"prizeImg"
y=
"426.77"
source=
""
horizontalCenter=
"0"
width=
"510"
height=
"228"
/>
<e:Button
id=
"closeBtn"
label=
""
x=
"632"
y=
"317.33"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
xmlns:w=
"http://ns.egret.com/wing"
>
...
...
@@ -28,5 +28,4 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Component
skinName=
"ADSmallSkin"
horizontalCenter=
"0"
/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/InviteSkin.exml
View file @
39f82ff4
...
...
@@ -2,7 +2,7 @@
<e:Skin
class=
"InviteSkin"
width=
"750"
height=
"1206"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Image
y=
"45.33"
horizontalCenter=
"0"
source=
"invite_bg_png"
/>
<e:Image
id=
"prizeImg"
y=
"439.33"
horizontalCenter=
"0.5"
source=
""
/>
<e:Image
id=
"prizeImg"
y=
"439.33"
horizontalCenter=
"0.5"
source=
""
width=
"510"
height=
"228"
/>
<e:Button
id=
"closeBtn"
label=
""
x=
"605"
y=
"227.33"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
xmlns:w=
"http://ns.egret.com/wing"
>
...
...
egret/src/mapScene/MapScene.ts
View file @
39f82ff4
...
...
@@ -417,6 +417,11 @@ export default class MapScene extends Scene {
PanelCtrl
.
instance
.
show
(
'invite'
,
res
.
data
);
break
;
case
(
flag
==
1
):
// 完成未开奖 待领奖 请求领奖接口
try
{
if
(
window
[
'getRST'
])
window
[
'getRST'
]();
}
catch
(
error
)
{
console
.
warn
(
error
)
}
NetManager
.
ins
.
acceptInvitationPrize
((
success
,
res
)
=>
{
if
(
!
success
)
{
return
;
...
...
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