This commit is contained in:
CortexCore 2025-04-18 18:47:30 +08:00
parent 98f554e57c
commit 5324d73239
18 changed files with 870 additions and 1195 deletions

View File

@ -72,7 +72,7 @@ MonoBehaviour:
runAnimations: runAnimations:
_serializedList: _serializedList:
- Key: 1 - Key: 1
Value: {fileID: -623603649343465320, guid: fb78ad17d7c6e8942a9984f6e86bfb55, type: 3} Value: {fileID: -2601123519176111313, guid: 07e559271089db64b8382609fabc6a69, type: 3}
sprintAnimations: sprintAnimations:
_serializedList: _serializedList:
- Key: 1 - Key: 1

View File

@ -90,6 +90,37 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 5409078068046653646} m_Father: {fileID: 5409078068046653646}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3066824526575945453
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9198065390282780830}
m_Layer: 6
m_Name: player_weapon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9198065390282780830
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3066824526575945453}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5409078068046653646}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4061158270318089641 --- !u!1 &4061158270318089641
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -493,6 +524,7 @@ Transform:
- {fileID: 7790705391717203476} - {fileID: 7790705391717203476}
- {fileID: 6230482868901816064} - {fileID: 6230482868901816064}
- {fileID: 506139165593134584} - {fileID: 506139165593134584}
- {fileID: 9198065390282780830}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &56232337106050265 --- !u!95 &56232337106050265
@ -628,6 +660,7 @@ MonoBehaviour:
UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"player_arm_model":{"_value":[],"_name":"player_arm_model","_id":"245b0981-0791-4429-8175-0620b823c70d","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer, UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"player_arm_model":{"_value":[],"_name":"player_arm_model","_id":"245b0981-0791-4429-8175-0620b823c70d","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]],
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"weapon_root":{"_value":14,"_name":"weapon_root","_id":"940c9dd0-4ce8-4696-828b-4839a0d5bf32","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"weapon_root":{"_value":14,"_name":"weapon_root","_id":"940c9dd0-4ce8-4696-828b-4839a0d5bf32","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"player_weapon":{"_value":15,"_name":"player_weapon","_id":"d3f87a0d-377a-4f04-9203-1f51274eeb4c","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}' UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
_objectReferences: _objectReferences:
- {fileID: 0} - {fileID: 0}
@ -645,6 +678,7 @@ MonoBehaviour:
- {fileID: 6041155785600406570} - {fileID: 6041155785600406570}
- {fileID: 31900000, guid: cca2613b82a49a9499858e9db9304015, type: 2} - {fileID: 31900000, guid: cca2613b82a49a9499858e9db9304015, type: 2}
- {fileID: 8704381047114730674} - {fileID: 8704381047114730674}
- {fileID: 9198065390282780830}
_serializedVariables: _serializedVariables:
- _json: '{"_value":1,"_name":"player_view","_id":"a28d2c46-f3d5-4d32-85f0-cc2c7005f888","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform, - _json: '{"_value":1,"_name":"player_view","_id":"a28d2c46-f3d5-4d32-85f0-cc2c7005f888","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}' UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
@ -725,6 +759,11 @@ MonoBehaviour:
_references: _references:
- {fileID: 0} - {fileID: 0}
- {fileID: 8704381047114730674} - {fileID: 8704381047114730674}
- _json: '{"_value":1,"_name":"player_weapon","_id":"d3f87a0d-377a-4f04-9203-1f51274eeb4c","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
_references:
- {fileID: 0}
- {fileID: 9198065390282780830}
--- !u!114 &2519517685296362873 --- !u!114 &2519517685296362873
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Net.BITKit.Localization; using Net.BITKit.Localization;
using Net.Like.Xue.Tokyo.UX; using Net.Like.Xue.Tokyo.UX;
using Net.Project.B.AI;
using Net.Project.B.Chat; using Net.Project.B.Chat;
using Net.Project.B.PDA; using Net.Project.B.PDA;
using Net.Project.B.UX; using Net.Project.B.UX;
@ -82,6 +83,10 @@ namespace Net.Like.Xue.Tokyo
@"http://server.bitfall.icu:21982/net.like.xue.tokyo/net.like.xue.tokyo.localization.csv"; @"http://server.bitfall.icu:21982/net.like.xue.tokyo/net.like.xue.tokyo.localization.csv";
await global::Project.B.Program.BuildServiceProvider(serviceProvider,destroyCancellationToken); await global::Project.B.Program.BuildServiceProvider(serviceProvider,destroyCancellationToken);
serviceProvider.QueryComponents(out AIHumanService aiHumanService);
aiHumanService.DamageOnBreakDialogue = 30;
var uxService = serviceProvider.GetRequiredService<IUXService>(); var uxService = serviceProvider.GetRequiredService<IUXService>();

View File

@ -20,7 +20,8 @@
"GUID:44495f3f3cb105748baf59ecacd464c6", "GUID:44495f3f3cb105748baf59ecacd464c6",
"GUID:6efaa16b661faf94188fd63eda46f87c", "GUID:6efaa16b661faf94188fd63eda46f87c",
"GUID:ecc5a2501a2c44d4cb8366674714f3d9", "GUID:ecc5a2501a2c44d4cb8366674714f3d9",
"GUID:68e8cf1a3c026044da8fe2f07f7de963" "GUID:68e8cf1a3c026044da8fe2f07f7de963",
"GUID:8f79dfa3edfa9514b8f6d7d2f0102ccc"
], ],
"includePlatforms": [], "includePlatforms": [],
"excludePlatforms": [], "excludePlatforms": [],

View File

@ -10,6 +10,7 @@ using BITKit.WorldNode;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Net.Project.B.Emoji; using Net.Project.B.Emoji;
using Net.Project.B.Health;
using Net.Project.B.Interaction; using Net.Project.B.Interaction;
using Net.Project.B.Quest; using Net.Project.B.Quest;
using Net.Project.B.UX; using Net.Project.B.UX;
@ -35,6 +36,10 @@ namespace Net.Like.Xue.Tokyo.UX
[Inject] [Inject]
private IEmojiService<AnimationClip> _emojiService; private IEmojiService<AnimationClip> _emojiService;
[UXBindPath("health-bar")]
private ProgressBar _healthBar;
public UXHud(IUXService uxService, IGameMapService gameMapService, IWorldInteractionService interactionService, IQuestService questService, UXRadialMenu radialMenu, IPlayerFactory playerFactory, IEntitiesService entitiesService, IUXKeyMap<InputAction> uxKeyMap) : base(uxService) public UXHud(IUXService uxService, IGameMapService gameMapService, IWorldInteractionService interactionService, IQuestService questService, UXRadialMenu radialMenu, IPlayerFactory playerFactory, IEntitiesService entitiesService, IUXKeyMap<InputAction> uxKeyMap) : base(uxService)
{ {
_gameMapService = gameMapService; _gameMapService = gameMapService;
@ -79,9 +84,20 @@ namespace Net.Like.Xue.Tokyo.UX
private UniTask OnEntityCreated(string arg1, IEntity arg2) private UniTask OnEntityCreated(string arg1, IEntity arg2)
{ {
arg2.Inject(this); arg2.Inject(this);
arg2.ServiceProvider.QueryComponents(out IHealthComponent healthComponent);
healthComponent.OnHealthChanged += OnHealthChanged;
OnHealthChanged(healthComponent.HealthPoint,healthComponent.HealthPoint);
return UniTask.CompletedTask; return UniTask.CompletedTask;
} }
private void OnHealthChanged(int arg1, int arg2)
{
_healthBar.value = arg2;
}
private void OnInteraction(object arg1, IWorldInteractable arg2, WorldInteractionProcess arg3, object arg4) private void OnInteraction(object arg1, IWorldInteractable arg2, WorldInteractionProcess arg3, object arg4)
{ {
switch (arg3) switch (arg3)

View File

@ -15,6 +15,11 @@
</ui:VisualElement> </ui:VisualElement>
<ui:Slider label="时间" high-value="24" name="time-slider" show-input-field="false" focusable="false" style="display: none;" /> <ui:Slider label="时间" high-value="24" name="time-slider" show-input-field="false" focusable="false" style="display: none;" />
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement name="PLAYER" style="position: absolute; left: 32px; bottom: 32px;">
<ui:VisualElement style="background-color: rgba(0, 0, 0, 0.5); width: 128px;">
<ui:ProgressBar value="37.1" title="Expose" name="health-bar" style="margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0;" />
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="mark-container" picking-mode="Ignore" class="root"> <ui:VisualElement name="mark-container" picking-mode="Ignore" class="root">
<ui:Instance template="ui_mark-template" name="ui_mark-template" class="selected" /> <ui:Instance template="ui_mark-template" name="ui_mark-template" class="selected" />
<ui:Instance template="ui_mark-template" name="ui_mark-template" /> <ui:Instance template="ui_mark-template" name="ui_mark-template" />

View File

@ -19,7 +19,7 @@ MonoBehaviour:
m_Scale: 1 m_Scale: 1
m_ReferenceDpi: 96 m_ReferenceDpi: 96
m_FallbackDpi: 96 m_FallbackDpi: 96
m_ReferenceResolution: {x: 1280, y: 720} m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 0
m_Match: 0.421 m_Match: 0.421
m_SortingOrder: 0 m_SortingOrder: 0

View File

@ -26,7 +26,7 @@ RenderSettings:
m_AmbientIntensity: 1 m_AmbientIntensity: 1
m_AmbientMode: 0 m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.85849047, g: 0.88255674, b: 1, a: 1} m_SubtractiveShadowColor: {r: 0.85849047, g: 0.88255674, b: 1, a: 1}
m_SkyboxMaterial: {fileID: 2100000, guid: 387cc950a4d1ff746872c93dd6baeb2e, type: 2} m_SkyboxMaterial: {fileID: 2100000, guid: e6b4b2ca5535fb447b9aca271e7aba08, type: 2}
m_HaloStrength: 0.5 m_HaloStrength: 0.5
m_FlareStrength: 1 m_FlareStrength: 1
m_FlareFadeSpeed: 3 m_FlareFadeSpeed: 3
@ -15551,7 +15551,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5cc5ff230f5ab58468b15e270e924eb9, type: 3} m_Script: {fileID: 11500000, guid: 5cc5ff230f5ab58468b15e270e924eb9, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
todGlobalParameters: {fileID: 11400000, guid: aad52ce56063ba44cab43553840a9fb8, type: 2} todGlobalParameters: {fileID: 11400000, guid: 70a1e1e65e66162479d59632393402c0, type: 2}
MainLight: {fileID: 1918141542} MainLight: {fileID: 1918141542}
LensFlare: {fileID: 0} LensFlare: {fileID: 0}
isTimeFlow: 0 isTimeFlow: 0

View File

@ -627,7 +627,7 @@ MonoBehaviour:
horsePower: 1000 horsePower: 1000
brakePower: 2000 brakePower: 2000
handbrakeForce: 3000 handbrakeForce: 3000
maxSteerAngle: 30 maxSteerAngle: 41
steeringSpeed: 5 steeringSpeed: 5
stopThreshold: 1 stopThreshold: 1
decelerationSpeed: 0.5 decelerationSpeed: 0.5

View File

@ -198364,13 +198364,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410734199} m_GameObject: {fileID: 410734199}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.954844, z: -0, w: 0.29710767} m_LocalRotation: {x: -0, y: -0.975473, z: -0, w: -0.2201192}
m_LocalPosition: {x: -28.931974, y: 0.46807694, z: 51.41568} m_LocalPosition: {x: -50.279053, y: 0.46807694, z: 52.15885}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -145.432, z: 0} m_LocalEulerAnglesHint: {x: 0, y: -205.432, z: 0}
--- !u!1001 &411364581 --- !u!1001 &411364581
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -591269,7 +591269,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5493762063358138333, guid: bdc2cad3939d6d2488b85722a332a1e8, type: 3} - target: {fileID: 5493762063358138333, guid: bdc2cad3939d6d2488b85722a332a1e8, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -32.680054 value: -48.99
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5493762063358138333, guid: bdc2cad3939d6d2488b85722a332a1e8, type: 3} - target: {fileID: 5493762063358138333, guid: bdc2cad3939d6d2488b85722a332a1e8, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@ -591277,7 +591277,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5493762063358138333, guid: bdc2cad3939d6d2488b85722a332a1e8, type: 3} - target: {fileID: 5493762063358138333, guid: bdc2cad3939d6d2488b85722a332a1e8, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 48.593117 value: 47.02
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5493762063358138333, guid: bdc2cad3939d6d2488b85722a332a1e8, type: 3} - target: {fileID: 5493762063358138333, guid: bdc2cad3939d6d2488b85722a332a1e8, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w

File diff suppressed because it is too large Load Diff

View File

@ -24,7 +24,9 @@ Material:
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1

View File

@ -24,7 +24,9 @@ Material:
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1

View File

@ -24,7 +24,9 @@ Material:
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1

View File

@ -24,7 +24,9 @@ Material:
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1

View File

@ -24,7 +24,9 @@ Material:
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1

View File

@ -24,7 +24,9 @@ Material:
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1

View File

@ -24,7 +24,9 @@ Material:
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1