mirror of
https://github.com/duckietm/Nitro-V3.git
synced 2026-06-20 15:36:18 +00:00
Merge branch 'Dev' into feat/navigator-p2-query
This commit is contained in:
@@ -11,6 +11,7 @@ export class BotSkillsEnum
|
|||||||
public static NUX_PROCEED: number = 8;
|
public static NUX_PROCEED: number = 8;
|
||||||
public static CHANGE_BOT_MOTTO: number = 9;
|
public static CHANGE_BOT_MOTTO: number = 9;
|
||||||
public static NUX_TAKE_TOUR: number = 10;
|
public static NUX_TAKE_TOUR: number = 10;
|
||||||
|
public static ROTATE: number = 11;
|
||||||
public static NO_PICK_UP: number = 12;
|
public static NO_PICK_UP: number = 12;
|
||||||
public static NAVIGATOR_SEARCH: number = 14;
|
public static NAVIGATOR_SEARCH: number = 14;
|
||||||
public static DONATE_TO_USER: number = 24;
|
public static DONATE_TO_USER: number = 24;
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import createRoomImg from '../../assets/images/navigator/create_room.png';
|
|||||||
import randomRoomImg from '../../assets/images/navigator/random_room.png';
|
import randomRoomImg from '../../assets/images/navigator/random_room.png';
|
||||||
import promoteRoomImg from '../../assets/images/navigator/promote_room.png';
|
import promoteRoomImg from '../../assets/images/navigator/promote_room.png';
|
||||||
import { CreateLinkEvent, LocalizeText, SendMessageComposer, TryVisitRoom } from '../../api';
|
import { CreateLinkEvent, LocalizeText, SendMessageComposer, TryVisitRoom } from '../../api';
|
||||||
import { Flex, Text } from '../../common';
|
import { Flex, Text, WidgetErrorBoundary } from '../../common';
|
||||||
import { useNavigatorData, useNavigatorSearch, useNavigatorUiState, useNavigatorUiStore, useNitroEvent } from '../../hooks';
|
import { useNavigatorActions, useNavigatorData, useNavigatorUiState, useNavigatorUiStore, useNitroEvent } from '../../hooks';
|
||||||
import { NavigatorDoorStateView } from './views/NavigatorDoorStateView';
|
import { NavigatorDoorStateView } from './views/NavigatorDoorStateView';
|
||||||
import { NavigatorRoomCreatorView } from './views/NavigatorRoomCreatorView';
|
import { NavigatorRoomCreatorView } from './views/NavigatorRoomCreatorView';
|
||||||
import { NavigatorRoomInfoView } from './views/NavigatorRoomInfoView';
|
import { NavigatorRoomInfoView } from './views/NavigatorRoomInfoView';
|
||||||
@@ -178,13 +178,26 @@ export const NavigatorView: FC<{}> = props =>
|
|||||||
</Flex>
|
</Flex>
|
||||||
</div>
|
</div>
|
||||||
</div> }
|
</div> }
|
||||||
{ isCreatorOpen && <NavigatorRoomCreatorView /> }
|
{ isCreatorOpen &&
|
||||||
|
<WidgetErrorBoundary name="NavigatorRoomCreator">
|
||||||
|
<NavigatorRoomCreatorView />
|
||||||
|
</WidgetErrorBoundary> }
|
||||||
</NitroCard.Content>
|
</NitroCard.Content>
|
||||||
</NitroCard> }
|
</NitroCard> }
|
||||||
|
<WidgetErrorBoundary name="NavigatorDoorState">
|
||||||
<NavigatorDoorStateView />
|
<NavigatorDoorStateView />
|
||||||
{ isRoomInfoOpen && <NavigatorRoomInfoView onCloseClick={ () => useNavigatorUiStore.getState().setRoomInfoOpen(false) } /> }
|
</WidgetErrorBoundary>
|
||||||
{ isRoomLinkOpen && <NavigatorRoomLinkView onCloseClick={ () => useNavigatorUiStore.getState().setRoomLinkOpen(false) } /> }
|
{ isRoomInfoOpen &&
|
||||||
|
<WidgetErrorBoundary name="NavigatorRoomInfo">
|
||||||
|
<NavigatorRoomInfoView onCloseClick={ () => useNavigatorUiStore.getState().setRoomInfoOpen(false) } />
|
||||||
|
</WidgetErrorBoundary> }
|
||||||
|
{ isRoomLinkOpen &&
|
||||||
|
<WidgetErrorBoundary name="NavigatorRoomLink">
|
||||||
|
<NavigatorRoomLinkView onCloseClick={ () => useNavigatorUiStore.getState().setRoomLinkOpen(false) } />
|
||||||
|
</WidgetErrorBoundary> }
|
||||||
|
<WidgetErrorBoundary name="NavigatorRoomSettings">
|
||||||
<NavigatorRoomSettingsView />
|
<NavigatorRoomSettingsView />
|
||||||
|
</WidgetErrorBoundary>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -109,6 +109,10 @@ export const AvatarInfoWidgetRentableBotView: FC<AvatarInfoWidgetRentableBotView
|
|||||||
case 'dance':
|
case 'dance':
|
||||||
SendMessageComposer(new BotSkillSaveComposer(avatarInfo.webID, BotSkillsEnum.DANCE, ''));
|
SendMessageComposer(new BotSkillSaveComposer(avatarInfo.webID, BotSkillsEnum.DANCE, ''));
|
||||||
break;
|
break;
|
||||||
|
case 'rotate':
|
||||||
|
SendMessageComposer(new BotSkillSaveComposer(avatarInfo.webID, BotSkillsEnum.ROTATE, ''));
|
||||||
|
hideMenu = false;
|
||||||
|
break;
|
||||||
case 'nux_take_tour':
|
case 'nux_take_tour':
|
||||||
CreateLinkEvent('help/tour');
|
CreateLinkEvent('help/tour');
|
||||||
SendMessageComposer(new BotSkillSaveComposer(avatarInfo.webID, BotSkillsEnum.NUX_TAKE_TOUR, ''));
|
SendMessageComposer(new BotSkillSaveComposer(avatarInfo.webID, BotSkillsEnum.NUX_TAKE_TOUR, ''));
|
||||||
@@ -170,6 +174,10 @@ export const AvatarInfoWidgetRentableBotView: FC<AvatarInfoWidgetRentableBotView
|
|||||||
<ContextMenuListItemView onClick={ event => processAction('dance') }>
|
<ContextMenuListItemView onClick={ event => processAction('dance') }>
|
||||||
{ LocalizeText('avatar.widget.dance') }
|
{ LocalizeText('avatar.widget.dance') }
|
||||||
</ContextMenuListItemView> }
|
</ContextMenuListItemView> }
|
||||||
|
{ (avatarInfo.botSkills.indexOf(BotSkillsEnum.ROTATE) >= 0) &&
|
||||||
|
<ContextMenuListItemView onClick={ event => processAction('rotate') }>
|
||||||
|
{ LocalizeText('tooltip.roombuilding.rotate') }
|
||||||
|
</ContextMenuListItemView> }
|
||||||
{ (avatarInfo.botSkills.indexOf(BotSkillsEnum.NO_PICK_UP) === -1) &&
|
{ (avatarInfo.botSkills.indexOf(BotSkillsEnum.NO_PICK_UP) === -1) &&
|
||||||
<ContextMenuListItemView onClick={ event => processAction('pick') }>
|
<ContextMenuListItemView onClick={ event => processAction('pick') }>
|
||||||
{ LocalizeText('avatar.widget.pick_up') }
|
{ LocalizeText('avatar.widget.pick_up') }
|
||||||
|
|||||||
Reference in New Issue
Block a user