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
9dfaac5d
Commit
9dfaac5d
authored
Aug 23, 2019
by
wildfirecode
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
7bc95486
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
+13
-7
NetManager.ts
egret/libs/tw/manager/NetManager.ts
+1
-1
map.tmproject
egret/resource/TextureMerger/map.tmproject
+1
-1
MainScene.ts
egret/src/mainScene/MainScene.ts
+6
-4
MapScene.ts
egret/src/mapScene/MapScene.ts
+5
-1
No files found.
egret/libs/tw/manager/NetManager.ts
View file @
9dfaac5d
...
@@ -700,7 +700,7 @@ export class NetManager extends ABNetManager {
...
@@ -700,7 +700,7 @@ export class NetManager extends ABNetManager {
*/
*/
public
getPlugOrderStatus
(
callback
:
Function
,
orderId
:
number
,
pollingCheck
:
Function
,
pollingCount
=
5
,
prizeLevel
?:
number
):
void
{
public
getPlugOrderStatus
(
callback
:
Function
,
orderId
:
number
,
pollingCheck
:
Function
,
pollingCount
=
5
,
prizeLevel
?:
number
):
void
{
const
net
:
INetData
=
{
const
net
:
INetData
=
{
name
:
NetName
.
PLUG_ORDER_STATUS
,
name
:
'getPlugOrderStatus'
,
uri
:
'/plugin/getOrderStatus'
,
uri
:
'/plugin/getOrderStatus'
,
type
:
'get'
,
type
:
'get'
,
dataType
:
'json'
,
dataType
:
'json'
,
...
...
egret/resource/TextureMerger/map.tmproject
View file @
9dfaac5d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/icon.png","../assets/map/animal1.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/iconbg.png","../assets/map/光 副本 4.png"]}
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/icon.png","../assets/map/animal1.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/iconbg.png","../assets/map/光 副本 4.png","../assets/map/音乐关闭.png","../assets/map/声音关闭.png"]}
\ No newline at end of file
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @
9dfaac5d
...
@@ -46,6 +46,7 @@ import SceneCtrl from '../../libs/new_wx/ctrls/sceneCtrl';
...
@@ -46,6 +46,7 @@ import SceneCtrl from '../../libs/new_wx/ctrls/sceneCtrl';
import
{
PropGuide
}
from
'../something/uis/PropGuide'
;
import
{
PropGuide
}
from
'../something/uis/PropGuide'
;
import
{
createData
}
from
'../startScene/StartScene'
;
import
{
createData
}
from
'../startScene/StartScene'
;
import
{
Loading2
}
from
'../something/uis/Loading2'
;
import
{
Loading2
}
from
'../something/uis/Loading2'
;
import
{
NetName
}
from
'../../libs/tw/enum/NetName'
;
const
aniClass
=
{
const
aniClass
=
{
"BoomAni"
:
BoomAni
,
"BoomAni"
:
BoomAni
,
...
@@ -2120,12 +2121,13 @@ export default class MainScene extends Scene {
...
@@ -2120,12 +2121,13 @@ export default class MainScene extends Scene {
NetManager
.
ins
.
hc_submit
((
s
,
data
)
=>
{
NetManager
.
ins
.
hc_submit
((
s
,
data
)
=>
{
if
(
s
)
{
if
(
s
)
{
//提交成功后捞结果
//提交成功后捞结果
NetManager
.
ins
.
getOrderStatus
((
s
)
=>
{
NetManager
.
ins
.
get
Plug
OrderStatus
((
s
)
=>
{
Loading2
.
instace
.
hide
();
Loading2
.
instace
.
hide
();
playSound
(
SoundType
.
sucess
);
playSound
(
SoundType
.
sucess
);
if
(
s
)
{
if
(
s
)
{
const
data
=
DataManager
.
ins
.
getData
(
'getPlugOrderStatus'
);
//区分奖品
//区分奖品
if
(
DataManager
.
ins
.
getCustomOrderStatusD
ata
.
lottery
)
{
if
(
d
ata
.
lottery
)
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
starCount
:
this
.
scoreProgress
.
starCount
});
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
starCount
:
this
.
scoreProgress
.
starCount
});
}
else
{
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
starCount
:
this
.
scoreProgress
.
starCount
});
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
starCount
:
this
.
scoreProgress
.
starCount
});
...
@@ -2135,8 +2137,8 @@ export default class MainScene extends Scene {
...
@@ -2135,8 +2137,8 @@ export default class MainScene extends Scene {
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
starCount
:
this
.
scoreProgress
.
starCount
});
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
starCount
:
this
.
scoreProgress
.
starCount
});
}
}
},
},
DataManager
.
ins
.
getData
(
"hc_doJoin"
).
data
,
DataManager
.
ins
.
getData
(
'hc_doJoin'
).
data
,
()
=>
{
return
DataManager
.
ins
.
getCustomOrderStatusData
.
code
==
"C000000001"
;
})
()
=>
{
DataManager
.
ins
.
getData
(
'getPlugOrderStatus'
).
result
==
0
})
}
else
{
}
else
{
Loading2
.
instace
.
hide
();
Loading2
.
instace
.
hide
();
if
(
!
data
)
{
if
(
!
data
)
{
...
...
egret/src/mapScene/MapScene.ts
View file @
9dfaac5d
...
@@ -11,7 +11,7 @@ import MapTopPart from "./MapTopPart";
...
@@ -11,7 +11,7 @@ import MapTopPart from "./MapTopPart";
import
{
DataManager
}
from
"../../libs/tw/manager/DataManager"
;
import
{
DataManager
}
from
"../../libs/tw/manager/DataManager"
;
import
wait
from
"../../libs/new_tc/wait"
;
import
wait
from
"../../libs/new_tc/wait"
;
import
{
showToast
}
from
"../../libs/new_wx/ctrls/toastCtrl"
;
import
{
showToast
}
from
"../../libs/new_wx/ctrls/toastCtrl"
;
import
{
toggleSound
,
toggleBg
}
from
"../soundCtrl"
;
import
{
toggleSound
,
toggleBg
,
playBg
}
from
"../soundCtrl"
;
export
default
class
MapScene
extends
Scene
{
export
default
class
MapScene
extends
Scene
{
scrollGroup
:
eui
.
Group
;
scrollGroup
:
eui
.
Group
;
...
@@ -65,6 +65,10 @@ export default class MapScene extends Scene {
...
@@ -65,6 +65,10 @@ export default class MapScene extends Scene {
if
(
data
.
level
)
{
if
(
data
.
level
)
{
PanelCtrl
.
instance
.
show
(
'StartPanel'
,
data
.
level
)
PanelCtrl
.
instance
.
show
(
'StartPanel'
,
data
.
level
)
}
}
// this.stage.once(egret.TouchEvent.TOUCH_TAP,()=>{
// if(getBgOn)playBg();
// },this);
}
}
disableIcon
(
level
)
{
disableIcon
(
level
)
{
...
...
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