Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
Coloring_OL
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
Coloring_OL
Commits
2b3c9c8f
Commit
2b3c9c8f
authored
Jul 07, 2022
by
limingzhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 真实人名 头像
parent
3637a917
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
89 additions
and
27 deletions
+89
-27
.DS_Store
.DS_Store
+0
-0
Coloring_OL.js
assets/Coloring_OL/scene/Coloring_OL.js
+89
-27
No files found.
.DS_Store
View file @
2b3c9c8f
No preview for this file type
assets/Coloring_OL/scene/Coloring_OL.js
View file @
2b3c9c8f
...
...
@@ -472,7 +472,7 @@ cc.Class({
this
.
initMatchingView
();
await
this
.
initMatchingView
();
console
.
log
(
'
~~~~~~~ 4
'
);
...
...
@@ -524,8 +524,9 @@ cc.Class({
const
len
=
8
-
this
.
serverAllUser
.
length
;
for
(
let
i
=
0
;
i
<
len
;
i
++
)
{
const
aiId
=
id
+
i
;
const
headUrl
=
this
.
playerInfoData
[
i
].
headUrl
;
const
data
=
{
playerId
:
aiId
.
toString
(),
name
:
this
.
playerInfoData
[
i
].
name
,
headUrl
,
isAi
:
true
}
const
data
=
{
playerId
:
aiId
.
toString
(),
name
:
this
.
playerInfoData
[
i
].
name
}
this
.
sendServerEvent
(
'
add_ai
'
,
data
);
}
...
...
@@ -592,9 +593,7 @@ cc.Class({
nh
.
on
(
'
playerJoin
'
,
(
event
)
=>
{
// if (this.server) {
// this.server.onPlayerJoin(event);
// }
this
.
log
(
"
playerJoin
"
,
(
event
));
this
.
onPlayerJoin
(
event
);
...
...
@@ -646,6 +645,10 @@ cc.Class({
this
.
onAddAi
(
res
.
data
);
return
;
case
'
add_player
'
:
this
.
onAddPlayer
(
res
.
data
);
break
;
case
'
refresh_player_list
'
:
console
.
log
(
'
on refresh_player_list
'
)
this
.
onRefreshPlayerList
(
res
.
data
);
...
...
@@ -662,6 +665,34 @@ cc.Class({
onPlayerJoin
(
data
)
{
const
middleLayer
=
cc
.
find
(
"
middleLayer
"
);
if
(
middleLayer
)
{
const
middleLayerComponent
=
middleLayer
.
getComponent
(
"
middleLayer
"
);
if
(
middleLayerComponent
.
getUserInfo
&&
middleLayerComponent
.
getHeadUrl
)
{
middleLayerComponent
.
getUserInfo
().
then
((
kidInfo
)
=>
{
const
playerHeadUrl
=
middleLayerComponent
.
getHeadUrl
(
kidInfo
.
avatar_url
||
kidInfo
.
id
);
// playerInfo.playerHeadUrl = playerHeadUrl;
// playerInfo.playerName = kidInfo.nick_name || '拼读达人';
data
.
name
=
kidInfo
.
nick_name
||
'
拼读达人
'
;
data
.
playerHeadUrl
=
playerHeadUrl
this
.
sendServerEvent
(
'
add_player
'
,
data
);
return
;
})
}
}
data
.
name
=
'
拼读达人
'
;
data
.
headUrl
=
'
http://staging-teach.cdn.ireadabc.com/2e3d7b4c386400974bf9d6a1bb8550a7.png
'
;
this
.
sendServerEvent
(
'
add_player
'
,
data
);
return
;
console
.
log
(
"
in onPlayerJoin :
"
,
data
);
let
user
=
{
playerId
:
data
.
playerId
};
...
...
@@ -679,18 +710,28 @@ cc.Class({
}
}
console
.
log
(
'
in onPlayerJoin 2
'
,
JSON
.
stringify
(
user
));
this
.
addUser
(
user
)
},
onAddPlayer
(
data
)
{
console
.
log
(
'
onAddPlayer data:
'
,
data
);
if
(
this
.
isTeacher
)
{
this
.
addUser
({
playerId
:
data
.
playerId
,
name
:
data
.
name
,
headUrl
:
data
.
headUrl
})
}
},
onAddAi
(
data
)
{
console
.
log
(
'
in onAddAi data:
'
,
data
);
this
.
addUser
({
playerId
:
data
.
playerId
,
name
:
data
.
name
,
isAi
:
true
})
// if (this.isTeacher) {
this
.
addUser
(
data
)
// }
},
onRefreshPlayerList
(
data
)
{
...
...
@@ -1310,7 +1351,7 @@ cc.Class({
playerInfoData
:
null
,
loadingScript
:
null
,
initMatchingView
()
{
async
initMatchingView
()
{
// http://staging-teach.cdn.ireadabc.com/0751c28419a0e8ffb1f0e84435b081ce.png
// http://staging-teach.cdn.ireadabc.com/f596e586a31ac2813b1702557941c022.png
...
...
@@ -1376,24 +1417,40 @@ cc.Class({
for
(
let
i
=
0
;
i
<
this
.
serverAllUser
.
length
;
i
++
)
{
const
user
=
this
.
serverAllUser
[
i
];
const
isSelf
=
user
.
playerId
==
this
.
playerId
;
let
headUrl
=
playerData
[
i
].
headUrl
;
if
(
isSelf
&&
false
)
{
user
.
name
=
user
.
nick_name
headUrl
=
user
.
playerInfo
.
avatar
;
console
.
log
(
'
avatar:
'
,
user
.
playerInfo
.
avatar
)
}
else
{
// user.name = nameList[RandomInt(0, 6)];
user
.
name
=
playerData
[
i
].
name
}
script
.
addPlayer
(
user
.
name
,
isSelf
,
playerData
[
i
].
headUrl
);
let
headUrl
=
user
.
headUrl
||
playerData
[
i
].
headUrl
;
if
(
isSelf
)
{
user
.
name
=
'
拼读达人
'
;
// user.name = playerData[i].name;
const
middleLayer
=
cc
.
find
(
"
middleLayer
"
);
if
(
middleLayer
)
{
const
middleLayerComponent
=
middleLayer
.
getComponent
(
"
middleLayer
"
);
if
(
middleLayerComponent
.
getUserInfo
&&
middleLayerComponent
.
getHeadUrl
)
{
const
kidInfo
=
await
middleLayerComponent
.
getUserInfo
();
const
playerHeadUrl
=
middleLayerComponent
.
getHeadUrl
(
kidInfo
.
avatar_url
||
kidInfo
.
id
);
// playerInfo.playerHeadUrl = playerHeadUrl;
// playerInfo.playerName = kidInfo.nick_name || '拼读达人';
user
.
name
=
kidInfo
.
nick_name
||
'
拼读达人
'
;
headUrl
=
playerHeadUrl
;
}
}
if
(
this
.
isTeacher
)
{
// setTimeout(() => {
// this.gameServer.addUser(user);
// }, 1000);
// user.name = user.nick_name
// headUrl = user.playerInfo.avatar;
script
.
addPlayer
(
user
.
name
,
isSelf
,
headUrl
);
user
.
headUrl
=
headUrl
;
console
.
log
(
'
this.serverAllUser :
'
,
JSON
.
stringify
(
this
.
serverAllUser
))
}
else
{
user
.
name
=
playerData
[
i
].
name
;
this
.
serverAllUser
=
[];
return
;
}
// script.addPlayer(user.name, isSelf, headUrl);
}
// this.checkAddAi();
...
...
@@ -1436,6 +1493,7 @@ cc.Class({
for
(
let
i
=
0
;
i
<
this
.
serverAllUser
.
length
;
i
++
)
{
if
(
this
.
serverAllUser
[
i
].
playerId
==
user
.
playerId
)
{
console
.
log
(
'
该用户已经存在 无需再加入。
'
)
return
;
}
}
...
...
@@ -1446,17 +1504,21 @@ cc.Class({
const
isSelf
=
this
.
playerId
==
user
.
playerId
;
this
.
loadingScript
.
addPlayer
(
user
.
name
,
isSelf
,
this
.
playerInfoData
[
len
-
1
].
headUrl
);
let
headUrl
=
user
.
headUrl
this
.
loadingScript
.
addPlayer
(
user
.
name
,
isSelf
,
headUrl
);
console
.
log
(
'
isSelf:
'
,
isSelf
);
console
.
log
(
'
this.isTeacher:
'
,
this
.
isTeacher
);
console
.
log
(
'
user.isAi:
'
,
user
.
isAi
);
if
(
this
.
isTeacher
&&
!
user
.
isAi
)
{
setTimeout
(()
=>
{
this
.
sendServerEvent
(
'
refresh_player_list
'
,
this
.
serverAllUser
);
// this.gameServer.addUser(user);
},
1
);
}
},
...
...
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