diff --git a/Assets/Artists/Arts/Textures/texture_book_container.png b/Assets/Artists/Arts/Textures/texture_book_container.png new file mode 100644 index 000000000..947e85a4a Binary files /dev/null and b/Assets/Artists/Arts/Textures/texture_book_container.png differ diff --git a/Assets/Arts/Airport - terminal for airplanes/Scenes/scene_terminal/ReflectionProbe-2.exr.meta b/Assets/Artists/Arts/Textures/texture_book_container.png.meta similarity index 90% rename from Assets/Arts/Airport - terminal for airplanes/Scenes/scene_terminal/ReflectionProbe-2.exr.meta rename to Assets/Artists/Arts/Textures/texture_book_container.png.meta index 91bd6a050..1a86bff04 100644 --- a/Assets/Arts/Airport - terminal for airplanes/Scenes/scene_terminal/ReflectionProbe-2.exr.meta +++ b/Assets/Artists/Arts/Textures/texture_book_container.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 1b3fef3293960fc4f98bad589e7fe7e4 +guid: a8d9b1babb79cca40878068b365dd181 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -28,22 +28,22 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 + cubemapConvolution: 0 + seamlessCubemap: 0 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 - aniso: 0 + filterMode: 1 + aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 - nPOTScale: 1 + wrapW: 0 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,10 +52,10 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 + textureType: 8 + textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -73,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 100 + compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -125,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/Artists/Configs/URP/Project Wide_Renderer.asset b/Assets/Artists/Configs/URP/Project Wide_Renderer.asset index bbecefd99..6855e2161 100644 --- a/Assets/Artists/Configs/URP/Project Wide_Renderer.asset +++ b/Assets/Artists/Configs/URP/Project Wide_Renderer.asset @@ -88,7 +88,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Active: 1 volumetricFogSettings: - enable: 0 + enable: 1 renderPassEvent: 100 densityAndLightingComputeShader: {fileID: 7200000, guid: 9068eedc2333d524bba83267d923d5a9, type: 3} fogDensity: 0.2 diff --git a/Assets/Artists/Configs/Volume_Tokyo.asset b/Assets/Artists/Configs/Volume_Tokyo.asset index a31f91c29..86691776d 100644 --- a/Assets/Artists/Configs/Volume_Tokyo.asset +++ b/Assets/Artists/Configs/Volume_Tokyo.asset @@ -62,7 +62,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e021b4c809a781e468c2988c016ebbea, type: 3} m_Name: ColorLookup m_EditorClassIdentifier: - active: 1 + active: 0 texture: m_OverrideState: 1 m_Value: {fileID: 2800000, guid: 8c0cdd4f39befe14b87bf44dad8b96bc, type: 3} @@ -102,7 +102,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3} m_Name: ColorAdjustments m_EditorClassIdentifier: - active: 1 + active: 0 postExposure: m_OverrideState: 1 m_Value: 1 @@ -161,7 +161,7 @@ MonoBehaviour: active: 1 mode: m_OverrideState: 1 - m_Value: 1 + m_Value: 2 neutralHDRRangeReductionMode: m_OverrideState: 0 m_Value: 2 diff --git a/Assets/Artists/Configs/scriptable/scriptable_player_animations.asset b/Assets/Artists/Configs/scriptable/scriptable_player_animations.asset index e0c1e85a2..91dfd5ed5 100644 --- a/Assets/Artists/Configs/scriptable/scriptable_player_animations.asset +++ b/Assets/Artists/Configs/scriptable/scriptable_player_animations.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 495d5296549fa86488795de870c7aae4, type: 3} m_Name: Assets/Artists/Configs/scriptable_player_animations.asset m_EditorClassIdentifier: + tags: [] idleAnimations: _serializedList: - Key: @@ -77,13 +78,59 @@ MonoBehaviour: - Key: 1 Value: {fileID: -2141252149630718149, guid: f5f88ba834ff2f845893f706ccfca542, type: 3} knockedAnimations: - _serializedList: [] - knockingAnimations: [] - deathAnimations: [] - seatAnimations: [] + _serializedList: + - Key: + x: 0 + y: 0 + Value: {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + ladderAnimations: + _serializedList: + - Key: 0 + Value: {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + hitAnimations: + _serializedList: + - Key: + x: 0 + y: 0 + Value: {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + knockingAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + deathAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + seatAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + ladderEnterAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + ladderExitAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} stepUpAnimations: - {fileID: -2993534804863918692, guid: b3f40610e0721964c9679e65bd5a61bd, type: 3} slidingAnimations: - {fileID: 965086860733634941, guid: 224fd581a54ad3048b7ea3cd00db7941, type: 3} climbAnimations: - {fileID: -998496362607748373, guid: 0ad48af31f611b94fba9833e4fc50476, type: 3} + climbUpAnimations: + - {fileID: -2993534804863918692, guid: b3f40610e0721964c9679e65bd5a61bd, type: 3} + climbingAnimations: + _serializedList: [] + openParachuteAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + parachuteAnimations: + _serializedList: + - Key: + x: 0 + y: 0 + Value: {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + parachuteLandAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + freeFallAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + swimmingAnimations: + _serializedList: + - Key: 0 + Value: {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + vaultAnimations: + - {fileID: 1827226128182048838, guid: a4b8f2deec6a99945987cfc59b1b4e54, type: 3} + references: + version: 2 + RefIds: [] diff --git a/Assets/Artists/Scenes/map_menu.unity b/Assets/Artists/Scenes/map_menu.unity index bb2da8cdc..de2623204 100644 --- a/Assets/Artists/Scenes/map_menu.unity +++ b/Assets/Artists/Scenes/map_menu.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 3 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} + m_SkyboxMaterial: {fileID: 2100000, guid: a687823355eb47c40bb6c4998e78731d, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -577,6 +577,8 @@ GameObject: - component: {fileID: 1538247099} - component: {fileID: 1538247098} - component: {fileID: 1538247097} + - component: {fileID: 1538247102} + - component: {fileID: 1538247101} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -652,6 +654,39 @@ Transform: - {fileID: 1723278027} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1538247101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538247096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 054d7fc7589c04d4a8412a6f82b32d6c, type: 3} + m_Name: + m_EditorClassIdentifier: + worldNode: + rid: 7572707465095282692 + references: + version: 2 + RefIds: + - rid: 7572707465095282692 + type: {class: UXCosmeticsWorldProxy, ns: Net.Project.B.UX, asm: Net.Project.B.UX.Unity} + data: +--- !u!114 &1538247102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538247096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 230e015069b45484f9c85d1aba1e901c, type: 3} + m_Name: + m_EditorClassIdentifier: + debug: 0 --- !u!1001 &1723278026 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Artists/Scripts/UX/Net.Like.Xue.Tokyo.UX.asmdef b/Assets/Artists/Scripts/UX/Net.Like.Xue.Tokyo.UX.asmdef index 62326bb71..026f31007 100644 --- a/Assets/Artists/Scripts/UX/Net.Like.Xue.Tokyo.UX.asmdef +++ b/Assets/Artists/Scripts/UX/Net.Like.Xue.Tokyo.UX.asmdef @@ -19,7 +19,8 @@ "GUID:ba8323a5a01afc24188ded7f4b05db8a", "GUID:44495f3f3cb105748baf59ecacd464c6", "GUID:6efaa16b661faf94188fd63eda46f87c", - "GUID:ecc5a2501a2c44d4cb8366674714f3d9" + "GUID:ecc5a2501a2c44d4cb8366674714f3d9", + "GUID:68e8cf1a3c026044da8fe2f07f7de963" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Artists/Scripts/UX/UXEscMenu.cs b/Assets/Artists/Scripts/UX/UXEscMenu.cs index 55ae5f447..819e9b421 100644 --- a/Assets/Artists/Scripts/UX/UXEscMenu.cs +++ b/Assets/Artists/Scripts/UX/UXEscMenu.cs @@ -13,8 +13,11 @@ using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.UIElements; using System.Linq; +using AHD2TimeOfDay; using BITKit.Entities; using BITKit.Mod; +using BITKit.StateMachine; +using Microsoft.Extensions.Logging; using Net.BITKit.Localization; using Project.B.CharacterController; using Project.B.Entities; @@ -25,6 +28,7 @@ namespace Net.Like.Xue.Tokyo.UX { public class UXEscMenu : UIToolKitPanel,IDisposable { + private readonly ILogger _logger; private readonly IPlayerFactory _playerFactory; private readonly IEntitiesService _entitiesService; private readonly ILocalizationService _localizationService; @@ -48,13 +52,15 @@ namespace Net.Like.Xue.Tokyo.UX private Toggle _enableChsToggle; [UXBindPath("enable-tps-toggle")] private Toggle _enableTpsToggle; + [UXBindPath("time-slider")] + private Slider _timeSlider; private VisualTreeAsset _template; [Inject] private IPlayerCharacterController _playerCharacterController; - public UXEscMenu(IUXService uxService, IUXDialogue uxDialogue, IGameMapService gameMapService, IUXKeyMap uxKeyMap, IDialogueService dialogueService, ILocalizationService localizationService, IEntitiesService entitiesService, IPlayerFactory playerFactory) : base(uxService) + public UXEscMenu(IUXService uxService, IUXDialogue uxDialogue, IGameMapService gameMapService, IUXKeyMap uxKeyMap, IDialogueService dialogueService, ILocalizationService localizationService, IEntitiesService entitiesService, IPlayerFactory playerFactory, ILogger logger) : base(uxService) { _uxDialogue = uxDialogue; _gameMapService = gameMapService; @@ -63,6 +69,7 @@ namespace Net.Like.Xue.Tokyo.UX _localizationService = localizationService; _entitiesService = entitiesService; _playerFactory = playerFactory; + _logger = logger; OnInitiated += Initiated; OnInitiatedAsync += InitiatedAsync; @@ -73,6 +80,8 @@ namespace Net.Like.Xue.Tokyo.UX playerFactory.OnEntityCreated += OnEntityCreated; } + + private UniTask OnEntityCreated(string arg1, IEntity arg2) { arg2.Inject(this); @@ -90,6 +99,29 @@ arg2.Inject(this); { _template =await ModService.LoadAsset("ui_esc_menu_dialogue-template"); _dialogueContainer.Clear(); + + _timeSlider.RegisterValueChangedCallback(OnTime); + } + + public override void OnStateEntry(IState old) + { + base.OnStateEntry(old); + var enable = _entitiesService.QueryComponents().Length > 0; + + _timeSlider.SetEnabled(enable); + _timeSlider.tooltip = enable ? string.Empty : "这个地图没有开启昼夜系统"; + } + + private void OnTime(ChangeEvent evt) + { + var controllers = _entitiesService.QueryComponents(); + foreach (var todController in controllers) + { + var par = todController.todGlobalParameters; + par.CurrentTime = evt.newValue; + todController.todGlobalParameters = par; + todController.SetGlobalParameters(); + } } private UniTask OnDialogueStart(IDialogueData arg) @@ -170,7 +202,7 @@ arg2.Inject(this); _enableChsToggle.RegisterValueChangedCallback(x => { - _uxDialogue.SubtitleLanguage = x.newValue ? "zh-CN" : string.Empty; + _uxDialogue.SubtitleLanguages = x.newValue ? _localizationService.LocalizedStrings.Keys.ToArray() : null; }); _enableTpsToggle.RegisterValueChangedCallback(x => diff --git a/Assets/Artists/UX/ui_menu_esc.uxml b/Assets/Artists/UX/ui_menu_esc.uxml index 5ed9dc652..d30697815 100644 --- a/Assets/Artists/UX/ui_menu_esc.uxml +++ b/Assets/Artists/UX/ui_menu_esc.uxml @@ -19,6 +19,7 @@ + diff --git a/Assets/Artists/UX/ui_snapshot_window.uxml b/Assets/Artists/UX/ui_snapshot_window.uxml index d4a795bb6..a4faf6b12 100644 --- a/Assets/Artists/UX/ui_snapshot_window.uxml +++ b/Assets/Artists/UX/ui_snapshot_window.uxml @@ -1,13 +1,18 @@