Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OP32_PLUS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
template admin
OP32_PLUS
Commits
61961e74
Commit
61961e74
authored
Jun 29, 2022
by
范雪寒
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: bugs
parent
1e642681
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
11 deletions
+51
-11
OP32_PLUS.js
assets/OP32_PLUS/scene/OP32_PLUS.js
+24
-4
server.ts
assets/OP32_PLUS/scene/server.ts
+27
-7
No files found.
assets/OP32_PLUS/scene/OP32_PLUS.js
View file @
61961e74
...
@@ -417,6 +417,9 @@ cc.Class({
...
@@ -417,6 +417,9 @@ cc.Class({
this
.
networkHelper
.
on
(
"
frameEvent
"
,
(
event
)
=>
{
this
.
networkHelper
.
on
(
"
frameEvent
"
,
(
event
)
=>
{
event
.
data
.
frame
.
items
.
forEach
((
item
)
=>
{
event
.
data
.
frame
.
items
.
forEach
((
item
)
=>
{
if
(
this
.
server
)
{
this
.
server
.
onFrameEvent
(
item
.
data
);
}
if
(
item
.
data
.
type
==
"
all_player_info
"
)
{
if
(
item
.
data
.
type
==
"
all_player_info
"
)
{
item
.
data
.
playerData
.
forEach
((
player
)
=>
{
item
.
data
.
playerData
.
forEach
((
player
)
=>
{
if
(
!
this
.
allPlayerList
)
{
if
(
!
this
.
allPlayerList
)
{
...
@@ -467,10 +470,6 @@ cc.Class({
...
@@ -467,10 +470,6 @@ cc.Class({
duration
:
this
.
_gameDuration
duration
:
this
.
_gameDuration
});
});
}
}
}
else
if
(
item
.
data
.
type
==
"
complete
"
)
{
if
(
this
.
server
)
{
this
.
server
.
onPlayerComplete
(
item
.
data
.
uuid
,
item
.
data
.
duration
);
}
}
}
});
});
});
});
...
@@ -494,6 +493,27 @@ cc.Class({
...
@@ -494,6 +493,27 @@ cc.Class({
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
log
(
e
.
toString
());
this
.
log
(
e
.
toString
());
}
}
await
this
.
initHeadImgAndName
();
},
async
initHeadImgAndName
()
{
const
playerInfo
=
{
playerHeadUrl
:
"
http://staging-teach.cdn.ireadabc.com/0751c28419a0e8ffb1f0e84435b081ce.png
"
,
playerName
:
"
test
"
,
};
const
middleLayer
=
cc
.
find
(
"
middleLayer
"
);
if
(
middleLayer
)
{
const
kidInfo
=
await
middleLayer
.
getComponent
(
'
middleLayer
'
).
getUserInfo
();
const
playerHeadUrl
=
middleLayer
.
getComponent
(
'
middleLayer
'
).
getHeadUrl
(
kidInfo
.
avatar_url
||
kidInfo
.
id
);
playerInfo
.
playerHeadUrl
=
playerHeadUrl
;
playerInfo
.
playerName
=
kidInfo
.
nick_name
;
}
this
.
networkHelper
.
sendFrame
({
type
:
"
playerInfo
"
,
playerId
:
this
.
playerId
,
playerName
:
playerInfo
.
playerName
,
playerHeadUrl
:
playerInfo
.
playerHeadUrl
,
});
},
},
//TODO:copy---start
//TODO:copy---start
...
...
assets/OP32_PLUS/scene/server.ts
View file @
61961e74
...
@@ -40,15 +40,35 @@ export class GameServer {
...
@@ -40,15 +40,35 @@ export class GameServer {
duration
:
null
duration
:
null
});
});
if
(
this
.
playerList
.
length
==
this
.
playerMaxNumber
)
{
if
(
player
.
isAI
)
{
this
.
networkHelper
.
closeRoom
();
if
(
this
.
playerList
.
length
==
this
.
playerMaxNumber
)
{
this
.
startAIDuration
();
this
.
networkHelper
.
closeRoom
();
this
.
startAIDuration
();
}
this
.
networkHelper
.
sendFrame
({
type
:
'
all_player_info
'
,
playerData
:
this
.
playerList
});
}
}
}
this
.
networkHelper
.
sendFrame
({
onFrameEvent
(
event
)
{
type
:
'
all_player_info
'
,
if
(
event
.
type
==
"
complete
"
)
{
playerData
:
this
.
playerList
this
.
onPlayerComplete
(
event
.
uuid
,
event
.
duration
);
});
}
else
if
(
event
.
type
==
"
playerInfo
"
)
{
const
player
=
this
.
playerList
.
find
(
p
=>
p
.
uuid
==
event
.
playerId
);
player
.
name
=
event
.
playerName
;
player
.
headUrl
=
event
.
playerHeadUrl
;
if
(
this
.
playerList
.
length
==
this
.
playerMaxNumber
)
{
this
.
networkHelper
.
closeRoom
();
this
.
startAIDuration
();
}
this
.
networkHelper
.
sendFrame
({
type
:
'
all_player_info
'
,
playerData
:
this
.
playerList
});
}
}
}
onPlayerComplete
(
uuid
:
string
,
duration
:
number
)
{
onPlayerComplete
(
uuid
:
string
,
duration
:
number
)
{
...
...
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