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
f5ab12ea
Commit
f5ab12ea
authored
Jan 21, 2020
by
wildfirecode
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '122' into dev
parents
b395b753
74692f93
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
getRedBombAward.ts
egret/src/getRedBombAward.ts
+4
-1
MainScene.ts
egret/src/mainScene/MainScene.ts
+3
-1
AiControl.ts
egret/src/something/logic/AiControl.ts
+3
-1
No files found.
egret/src/getRedBombAward.ts
View file @
f5ab12ea
import
{
NetManager
}
from
"../libs/tw/manager/NetManager"
;
import
{
NetManager
}
from
"../libs/tw/manager/NetManager"
;
import
{
DataManager
}
from
"../libs/tw/manager/DataManager"
;
import
{
DataManager
}
from
"../libs/tw/manager/DataManager"
;
import
SceneCtrl
from
"../libs/new_wx/ctrls/sceneCtrl"
;
import
SceneCtrl
from
"../libs/new_wx/ctrls/sceneCtrl"
;
import
getHomeData
from
"./getHomeData"
;
/**
/**
* callback回调1是有奖,0是没有奖或者风控
* callback回调1是有奖,0是没有奖或者风控
...
@@ -17,7 +18,9 @@ export default (callback?) => {
...
@@ -17,7 +18,9 @@ export default (callback?) => {
// else {
// else {
// callback(0);
// callback(0);
// }
// }
NetManager
.
ins
.
hc_home
(()
=>
{
SceneCtrl
.
instance
.
updateScene
();
SceneCtrl
.
instance
.
updateScene
();
},
window
[
'collectRuleId'
]);
}
}
// else {
// else {
// callback(0);
// callback(0);
...
...
egret/src/mainScene/MainScene.ts
View file @
f5ab12ea
...
@@ -3101,7 +3101,9 @@ export default class MainScene extends Scene {
...
@@ -3101,7 +3101,9 @@ export default class MainScene extends Scene {
NetManager
.
ins
.
hc_redBombAward
((
success
)
=>
{
NetManager
.
ins
.
hc_redBombAward
((
success
)
=>
{
// if (success) // TODO 无论成功失败都弹,失败则为无奖励
// if (success) // TODO 无论成功失败都弹,失败则为无奖励
this
.
redBombPanelMark
=
true
;
this
.
redBombPanelMark
=
true
;
NetManager
.
ins
.
hc_home
(()
=>
{
SceneCtrl
.
instance
.
updateScene
();
SceneCtrl
.
instance
.
updateScene
();
},
window
[
'collectRuleId'
]);
});
});
}
}
}
}
...
...
egret/src/something/logic/AiControl.ts
View file @
f5ab12ea
...
@@ -131,7 +131,9 @@ export class AiControl {
...
@@ -131,7 +131,9 @@ export class AiControl {
if
(
!
six
.
length
)
{
if
(
!
six
.
length
)
{
NetManager
.
ins
.
hc_redBombAward
((
success
)
=>
{
NetManager
.
ins
.
hc_redBombAward
((
success
)
=>
{
if
(
success
)
thisObj
.
redBombPanelMark
=
true
;
if
(
success
)
thisObj
.
redBombPanelMark
=
true
;
NetManager
.
ins
.
hc_home
(()
=>
{
SceneCtrl
.
instance
.
updateScene
();
SceneCtrl
.
instance
.
updateScene
();
},
window
[
'collectRuleId'
]);
});
});
callback
();
callback
();
return
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