nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-10-23 03:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev

Browse Source
This commit is contained in:
Bill 2022-03-23 02:05:34 -04:00
commit b5e876c22b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/nitro/room/widgets/handlers/RoomWidgetChatHandler.ts
View File

@ -1,4 +1,4 @@
import { AvatarFigurePartType, AvatarScaleType, AvatarSetType, IAvatarImageListener, INitroPoint, IVector3D, NitroEvent, NitroPoint, PetFigureData, RoomObjectCategory, RoomObjectType, RoomObjectVariable, RoomSessionChatEvent, RoomWidgetEnum, SystemChatStyleEnum, TextureUtils, Vector3d } from '@nitrots/nitro-renderer';
import { AvatarFigurePartType, AvatarScaleType, AvatarSetType, IAvatarImageListener, INitroPoint, IVector3D, NitroEvent, NitroPoint, PetFigureData, RoomObjectCategory, RoomObjectType, RoomObjectVariable, RoomSessionChatEvent, RoomUserData, RoomWidgetEnum, SystemChatStyleEnum, TextureUtils, Vector3d } from '@nitrots/nitro-renderer';
import { GetAvatarRenderManager, GetConfigurationManager, GetRoomEngine, PlaySound } from '../../../..';
import { LocalizeText } from '../../../../utils/LocalizeText';
import { RoomWidgetUpdateChatEvent, RoomWidgetUpdateEvent } from '../events';
@ -20,11 +20,9 @@ export class RoomWidgetChatHandler extends RoomWidgetHandler implements IAvatarI
const roomObject = GetRoomEngine().getRoomObject(chatEvent.session.roomId, chatEvent.objectId, RoomObjectCategory.UNIT);
if(!roomObject) return;
const objectLocation = roomObject.getLocation();
const objectLocation = roomObject ? roomObject.getLocation() : new Vector3d();
const bubbleLocation = this.getBubbleLocation(chatEvent.session.roomId, objectLocation);
const userData = this.container.roomSession.userDataManager.getUserDataByIndex(chatEvent.objectId);
const userData = roomObject ? this.container.roomSession.userDataManager.getUserDataByIndex(chatEvent.objectId) : new RoomUserData(-1);
let username = '';
let avatarColor = 0;

1
src/components/room/widgets/chat/ChatWidgetView.scss
View File

@ -47,6 +47,7 @@
height: calc(100% - 0.5px);
border-radius: 7px;
z-index: 1;
background-color: #C8C8C8;
}
.chat-bubble {