diff --git a/Assets/Artists/Configs/Bullet.meta b/Assets/Artists/Configs/Bullet.meta new file mode 100644 index 000000000..df8592638 --- /dev/null +++ b/Assets/Artists/Configs/Bullet.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38e9902db9777f94b89e56e581e38646 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Bullet/NewScriptableBulletServiceData.asset b/Assets/Artists/Configs/Bullet/NewScriptableBulletServiceData.asset new file mode 100644 index 000000000..416e0f765 --- /dev/null +++ b/Assets/Artists/Configs/Bullet/NewScriptableBulletServiceData.asset @@ -0,0 +1,29 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcb6451023416b841bcd0f8ef63f0e07, type: 3} + m_Name: Assets/Artists/Configs/Bullet/NewScriptableBulletServiceData.asset + m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 0 + material: {fileID: 0} + bulletScaleCurve: + allow: 0 + value: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + debug: 0 + rectangleMesh: {fileID: 0} + quadMesh: {fileID: 0} diff --git a/Assets/Artists/Configs/Bullet/NewScriptableBulletServiceData.asset.meta b/Assets/Artists/Configs/Bullet/NewScriptableBulletServiceData.asset.meta new file mode 100644 index 000000000..cedc8a2d3 --- /dev/null +++ b/Assets/Artists/Configs/Bullet/NewScriptableBulletServiceData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b01808c2576581442ad1ccfa22043c5e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Volume_Tokyo.asset b/Assets/Artists/Configs/Volume_Tokyo.asset index a59f794b9..a31f91c29 100644 --- a/Assets/Artists/Configs/Volume_Tokyo.asset +++ b/Assets/Artists/Configs/Volume_Tokyo.asset @@ -161,7 +161,7 @@ MonoBehaviour: active: 1 mode: m_OverrideState: 1 - m_Value: 2 + m_Value: 1 neutralHDRRangeReductionMode: m_OverrideState: 0 m_Value: 2 diff --git a/Assets/Artists/Prefabs/node_interaction.prefab b/Assets/Artists/Prefabs/node_interaction.prefab index 2a00cc4f4..d539dca18 100644 --- a/Assets/Artists/Prefabs/node_interaction.prefab +++ b/Assets/Artists/Prefabs/node_interaction.prefab @@ -9,10 +9,11 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7552042800852554496} - - component: {fileID: 2476209963240049585} - component: {fileID: 690332996188739794} - component: {fileID: 2162917695259611933} - component: {fileID: 4295018689683312157} + - component: {fileID: 1423627268194580453} + - component: {fileID: 1376806574884562321} m_Layer: 0 m_Name: node_interaction m_TagString: Untagged @@ -35,26 +36,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2476209963240049585 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1382892546537064314} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db48a34ef668447439789f37091202ae, type: 3} - m_Name: - m_EditorClassIdentifier: - root: {fileID: 0} - type: - rid: -2 - references: - version: 2 - RefIds: - - rid: -2 - type: {class: , ns: , asm: } --- !u!65 &690332996188739794 BoxCollider: m_ObjectHideFlags: 0 @@ -103,8 +84,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 054d7fc7589c04d4a8412a6f82b32d6c, type: 3} m_Name: m_EditorClassIdentifier: - worldNodeService: - rid: 2091307956764147727 worldNode: rid: 2091307956764147728 references: @@ -112,9 +91,6 @@ MonoBehaviour: RefIds: - rid: -2 type: {class: , ns: , asm: } - - rid: 2091307956764147727 - type: {class: WorldNodeService, ns: BITKit.WorldNode, asm: BITKit.WorldNode} - data: - rid: 2091307956764147728 type: {class: WorldInfoNode, ns: BITKit.WorldNode, asm: BITKit.WorldNode} data: @@ -126,3 +102,36 @@ MonoBehaviour: type: {class: Reference, ns: BITKit, asm: BITKit} data: value: "\u5BF9\u8BDD" +--- !u!114 &1423627268194580453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1382892546537064314} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 230e015069b45484f9c85d1aba1e901c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1376806574884562321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1382892546537064314} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 054d7fc7589c04d4a8412a6f82b32d6c, type: 3} + m_Name: + m_EditorClassIdentifier: + worldNode: + rid: 7572707351853268992 + references: + version: 2 + RefIds: + - rid: 7572707351853268992 + type: {class: WorldInteractable, ns: Net.Project.B.Interaction, asm: Com.Project.B.Interaction} + data: + gameObject: {fileID: 1382892546537064314} diff --git a/Assets/Artists/Scripts/Program.cs b/Assets/Artists/Scripts/Program.cs index 80863be3f..8e1eff225 100644 --- a/Assets/Artists/Scripts/Program.cs +++ b/Assets/Artists/Scripts/Program.cs @@ -4,6 +4,7 @@ using BITKit.UX; using BITKit.UX.Settings; using Cysharp.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Net.Like.Xue.Tokyo.UX; using Net.Project.B.UX; using Project.B.Player; @@ -26,6 +27,7 @@ namespace Net.Like.Xue.Tokyo await global::Project.B.Program.AddProjectBServices(serviceCollection,source); serviceCollection.AddSingleton(); + serviceCollection.AddSingleton, UnityLogger>(); serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); diff --git a/Assets/Artists/Scripts/UX/UXLevel.cs b/Assets/Artists/Scripts/UX/UXLevel.cs index f69d42144..91b164bf9 100644 --- a/Assets/Artists/Scripts/UX/UXLevel.cs +++ b/Assets/Artists/Scripts/UX/UXLevel.cs @@ -30,7 +30,7 @@ namespace Net.Like.Xue.Tokyo.UX _levelContainer.Clear(); - foreach (var gameMapData in _entitiesService.QueryComponents()) + foreach (var gameMapData in _entitiesService.QueryComponents().ToArray()) { var button = _levelContainer.Create