diff --git a/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs b/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs index d538c6ffb..e434426b8 100644 --- a/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs +++ b/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs @@ -51,7 +51,6 @@ namespace Net.Like.Xue.Tokyo.GameService if (string.IsNullOrEmpty(portalNode.MapName?.Value) is false) { - _waitPlayer?.TrySetCanceled(); _waitPlayer = new(); await _gameMapService.StartMapAsync(portalNode.MapName.Value); diff --git a/Assets/Artists/Scripts/YangdunCreateFactory.cs b/Assets/Artists/Scripts/YangdunCreateFactory.cs index 2675b5307..880d521ff 100644 --- a/Assets/Artists/Scripts/YangdunCreateFactory.cs +++ b/Assets/Artists/Scripts/YangdunCreateFactory.cs @@ -166,6 +166,7 @@ namespace Net.Like.Xue.Tokyo if (go) Object.Destroy(go); } + _entities.Clear(); _healthService.OnHealthChanged-=OnHealthChanged; } private void OnHealthChanged(int arg1, int arg2, int arg3, object arg4) diff --git a/Assets/Artists/UX/ux_menu.uxml b/Assets/Artists/UX/ux_menu.uxml index 603c8e4a1..1046ccfc2 100644 --- a/Assets/Artists/UX/ux_menu.uxml +++ b/Assets/Artists/UX/ux_menu.uxml @@ -26,10 +26,9 @@ - - + diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_billboard_bookstore.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_billboard_bookstore.png index 958c8bfd1..1041c2090 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_billboard_bookstore.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_billboard_bookstore.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_BaseMap.png index 363d745f1..728a9be57 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_Emissive.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_Emissive.png index 12f4f0781..172371ec9 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_Emissive.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_Emissive.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall2_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall2_BaseMap.png index 4278602f3..57c912ff0 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall2_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall2_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_03_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_03_BaseMap.png index 6a42e5118..2f819f3e9 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_03_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_03_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_BaseMap.png index a7ad5db45..c9b9dba08 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_BaseMap.png index ead2ebfe2..823845a24 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront2_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront2_BaseMap.png index e604f0fca..0ed049d01 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront2_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront2_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_BaseMap.png index ee56a3d0b..f5a208b43 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_02_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_02_BaseMap.png index 73b41d4ea..16c6fe6af 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_02_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_02_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_05_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_05_BaseMap.png index c4eead3a2..38c8013ac 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_05_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_05_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_horiyontal2BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_horiyontal2BaseMap.png index 0a6e3dfd3..7ebdf6deb 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_horiyontal2BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_horiyontal2BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_metro_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_metro_BaseMap.png index bc057a65e..810604791 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_metro_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_metro_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_BaseMap.png index 51c7d1f2b..d0d00c4a7 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_BaseMap.png index 7ca43b810..cbffba925 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_BaseMap.png index 4eafd52da..d5cf5945f 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_BaseMap.png index 8979af429..98071f900 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_02_BaseMap .png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_02_BaseMap .png new file mode 100644 index 000000000..5018c41df Binary files /dev/null and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_02_BaseMap .png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_03_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_03_BaseMap.png index e12227931..c68dd665d 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_03_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_03_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_BaseMap.png index a6ebe6deb..398513f38 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_BaseMap.png b/Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_BaseMap.png index ee39d9f74..cbbb9a6d8 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_BaseMap.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_BaseMap.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_airline.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_airline.png index 09822b789..4f47fd863 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_airline.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_airline.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_arcadecenter.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_arcadecenter.png index 9cf280101..a088a95ec 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_arcadecenter.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_arcadecenter.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_baristacoffee.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_baristacoffee.png index 37599db85..63f832581 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_baristacoffee.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_baristacoffee.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_cosmetics_01.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_cosmetics_01.png index 828db79f4..0a2c7901e 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_cosmetics_01.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_cosmetics_01.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl_03.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl_03.png index 79eca6377..783d46568 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl_03.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl_03.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_hostclub_01.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_hostclub_01.png index d16ce4e9a..f06873599 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_hostclub_01.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_hostclub_01.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_phone.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_phone.png index 0db8bfd6b..843cc71e2 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_phone.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_phone.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_01.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_01.png index 38c35ad06..50d5ca158 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_01.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_01.png differ diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_02.png b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_02.png index 0fd4cf4a6..ffb37eebe 100644 Binary files a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_02.png and b/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_02.png differ diff --git a/Assets/BITKit/Unity/Scripts/UX/Library/TabContainer.cs b/Assets/BITKit/Unity/Scripts/UX/Library/TabContainer.cs index b87174f7a..fc973bc65 100644 --- a/Assets/BITKit/Unity/Scripts/UX/Library/TabContainer.cs +++ b/Assets/BITKit/Unity/Scripts/UX/Library/TabContainer.cs @@ -25,50 +25,48 @@ namespace BITKit.UX public new class UxmlFactory : UxmlFactory { } public TabContainer() { - RegisterCallback(OnAttachToPanel); - RegisterCallback(OnDetachFromPanel); - RegisterCallback(OnGeometryChanged); + RegisterCallback(RebuildOnEvent); + RegisterCallback(RebuildOnEvent); + RegisterCallback(RebuildOnEvent); + RegisterCallback(RebuildOnEvent); + RegisterCallback(RebuildOnEvent); } - - private void OnGeometryChanged(GeometryChangedEvent evt) - { - Rebuild(); - } - public string TabPath { get=>_tabPath; set { _tabPath = value; + Rebuild(); } } private string _tabPath; private TabBar _tabBar; private int _index; - private void OnDetachFromPanel(DetachFromPanelEvent evt) + private void RebuildOnEvent(T evt) { Rebuild(); } - private void OnAttachToPanel(AttachToPanelEvent evt) - { - Rebuild(); - } - private void Rebuild() { if (_tabBar is not null) { _tabBar.OnTabChanged -= OnTabChanged; } - _tabBar = panel.visualTree.Q(TabPath); + var p = parent; + while (p is not null) + { + _tabBar = p.Q(TabPath); + if (_tabBar is not null) + { + break; + } + p = p.parent; + } if (_tabBar is not null) { _tabBar.OnTabChanged += OnTabChanged; - } - if (_index <=0) - { - _index = 1; + _index = _tabBar.CurrentTab; } OnTabChanged(_index); } @@ -76,7 +74,7 @@ namespace BITKit.UX private void OnTabChanged(int obj) { _index = obj; - if (childCount <= 0) return; + if (childCount < 0) return; for (var i = 0; i < childCount; i++) { var visualElement = this[i]; diff --git a/Assets/BITKit/Unity/UX/Common/Common.uss b/Assets/BITKit/Unity/UX/Common/Common.uss index dc7af7b24..b1f3c8253 100644 --- a/Assets/BITKit/Unity/UX/Common/Common.uss +++ b/Assets/BITKit/Unity/UX/Common/Common.uss @@ -94,13 +94,13 @@ TabBar Button:disabled { } .gap-8 { - margin-top:-8px; + margin-top: -8px; margin-right: -8px; margin-bottom: -8px; margin-left: -8px; } -.gap-8 > *{ +.gap-8 > * { margin: 8px; } @@ -109,7 +109,7 @@ TabBar Button:disabled { margin-left: -8px; } -.gap-x-8 > *{ +.gap-x-8 > * { margin-left: 8px; margin-right: 8px; } @@ -119,7 +119,7 @@ TabBar Button:disabled { margin-bottom: -8px; } -.gap-y-8 > *{ +.gap-y-8 > * { margin-top: 8px; margin-bottom: 8px; } @@ -504,3 +504,7 @@ Button.clear { border-top-color: rgba(0, 0, 0, 0); border-bottom-color: rgba(0, 0, 0, 0); } + +TabContainer > * { + flex-grow: 1; +} diff --git a/Assets/Plugins/Polaris - Low Poly Ecosystem/Jupiter - Procedural Sky/Sample/Scenes/DayNightCycle/SkyProfile-741169173868421736.asset b/Assets/Plugins/Polaris - Low Poly Ecosystem/Jupiter - Procedural Sky/Sample/Scenes/DayNightCycle/SkyProfile-741169173868421736.asset index a3bb0b4d0..2f187eaab 100644 --- a/Assets/Plugins/Polaris - Low Poly Ecosystem/Jupiter - Procedural Sky/Sample/Scenes/DayNightCycle/SkyProfile-741169173868421736.asset +++ b/Assets/Plugins/Polaris - Low Poly Ecosystem/Jupiter - Procedural Sky/Sample/Scenes/DayNightCycle/SkyProfile-741169173868421736.asset @@ -210,11 +210,11 @@ Material: - _HorizonCloudStart: -0.01 - _HorizonCloudStartPosition: -0.01 - _HorizonCloudStep: 25 - - _HorizonExponent: 3.7988865 + - _HorizonExponent: 3.8273911 - _HorizonStep: 1000 - _HorizonThickness: 1 - _MoonGlow: 0.236 - - _MoonLightIntensity: 0.0000098453875 + - _MoonLightIntensity: 0.00001139632 - _MoonSize: 0.07 - _MoonSoftEdge: 0.22 - _OverheadCloudAltitude: 1000 @@ -223,8 +223,8 @@ Material: - _OverheadCloudFlowDirectionZ: 1 - _OverheadCloudFlowX: 1 - _OverheadCloudFlowZ: 1 - - _OverheadCloudRemapMax: 1.800091 - - _OverheadCloudRemapMin: 0.13612132 + - _OverheadCloudRemapMax: 1.8452492 + - _OverheadCloudRemapMin: 0.13822451 - _OverheadCloudSize: 10 - _OverheadCloudStep: 2 - _StarsDensity0: 0.4 @@ -245,26 +245,26 @@ Material: - _StarsTwinkle1: 6 - _StarsTwinkle2: 2 - _SunGlow: 0.45 - - _SunLightIntensity: 0.4233988 + - _SunLightIntensity: 0.43717447 - _SunSize: 0.07 - _SunSoftEdge: 0.5 m_Colors: - _DetailOverlayColor: {r: 1, g: 1, b: 1, a: 1} - _DetailOverlayTintColor: {r: 1, g: 1, b: 1, a: 1} - _FogColor: {r: 0.8490566, g: 0.69017035, b: 0.6287825, a: 1} - - _GroundColor: {r: 0.42867428, g: 0.4124601, b: 0.4438662, a: 1} + - _GroundColor: {r: 0.42987296, g: 0.41393125, b: 0.44480956, a: 1} - _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1} - - _HorizonColor: {r: 0.89745224, g: 0.8769851, b: 0.7890967, a: 1} + - _HorizonColor: {r: 0.89692837, g: 0.87857676, b: 0.79214877, a: 1} - _MoonColor: {r: 1, g: 1, b: 1, a: 0} - - _MoonDirection: {r: 0.24413833, g: 0.4449624, b: -0.8616293, a: 0} + - _MoonDirection: {r: 0.25133455, g: 0.4580781, b: -0.85264057, a: 0} - _MoonLightColor: {r: 0.8431373, g: 0.9843138, b: 1, a: 1} - - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.99058735} - - _SkyColor: {r: 0.23968326, g: 0.4430076, b: 0.6904413, a: 1} + - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.99229914} + - _SkyColor: {r: 0.24189956, g: 0.44873634, b: 0.69703615, a: 1} - _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1} - _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1} - _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1} - - _SunColor: {r: 0.9716981, g: 0.9248151, b: 0.8473489, a: 1} - - _SunDirection: {r: -0.45199794, g: -0.23085254, b: 0.86162925, a: 0} + - _SunColor: {r: 0.9716981, g: 0.92477906, b: 0.8472319, a: 1} + - _SunDirection: {r: -0.46532097, g: -0.23765716, b: 0.8526403, a: 0} - _SunLightColor: {r: 1, g: 0.99511117, b: 0.8632076, a: 1} m_BuildTextureStacks: [] --- !u!21 &8993251732621375409