nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-11-22 22:30:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into @feature/game-center

Browse Source
This commit is contained in:
Bill 2022-11-09 18:05:09 -05:00
commit 538735fffb
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.tsx
View File

@ -1,4 +1,4 @@
import { ConfigurationEvent, HabboWebTools, LegacyExternalInterface, Nitro, NitroCommunicationDemoEvent, NitroConfiguration, NitroEvent, NitroLocalizationEvent, NitroVersion, RoomEngineEvent, WebGL } from '@nitrots/nitro-renderer';
import { ConfigurationEvent, GetAssetManager, HabboWebTools, LegacyExternalInterface, Nitro, NitroCommunicationDemoEvent, NitroConfiguration, NitroEvent, NitroLocalizationEvent, NitroVersion, RoomEngineEvent, WebGL } from '@nitrots/nitro-renderer';
import { FC, useCallback, useEffect, useState } from 'react';
import { DispatchUiEvent, GetCommunication, GetConfiguration, GetNitroInstance, GetUIVersion } from './api';
import { Base, TransitionAnimation, TransitionAnimationTypes } from './common';
@ -88,7 +88,7 @@ export const App: FC<{}> = props =>
if(assetUrls && assetUrls.length) for(const url of assetUrls) urls.push(NitroConfiguration.interpolate(url));
GetNitroInstance().core.asset.downloadAssets(urls, (status: boolean) =>
GetAssetManager().downloadAssets(urls, (status: boolean) =>
{
if(status)
{

2
src/common/types/OverflowType.ts
View File

@ -1 +1 @@
export type OverflowType = 'auto' | 'hidden' | 'visible' | 'scroll' | 'unset';
export type OverflowType = 'auto' | 'hidden' | 'visible' | 'scroll' | 'y-scroll' | 'unset';

5
src/components/floorplan-editor/common/FloorplanEditor.ts
View File

@ -1,5 +1,4 @@
import { IGraphicAssetCollection, NitroPoint, NitroTilemap, PixiApplicationProxy, PixiInteractionEventProxy, POINT_STRUCT_SIZE } from '@nitrots/nitro-renderer';
import { GetNitroCore } from '../../../api';
import { GetAssetManager, IGraphicAssetCollection, NitroPoint, NitroTilemap, PixiApplicationProxy, PixiInteractionEventProxy, POINT_STRUCT_SIZE } from '@nitrots/nitro-renderer';
import { ActionSettings } from './ActionSettings';
import { FloorAction, HEIGHT_SCHEME, MAX_NUM_TILE_PER_AXIS, TILE_SIZE } from './Constants';
import { Tile } from './Tile';
@ -53,7 +52,7 @@ export class FloorplanEditor extends PixiApplicationProxy
{
if(this._isInitialized) return;
const collection = GetNitroCore().asset.getCollection('floor_editor');
const collection = GetAssetManager().getCollection('floor_editor');
if(!collection) return;