diff --git a/EintooAR/Assets/Plugins/Rewired.meta b/EintooAR/Assets/Plugins/Rewired.meta new file mode 100644 index 00000000..110552ed --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67b5b2972e42249f6b0218ab166e0a66 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal.meta b/EintooAR/Assets/Plugins/Rewired/Internal.meta new file mode 100644 index 00000000..59cac96d --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8cdcfdd141b51d5458f981aaf449fd9f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries.meta new file mode 100644 index 00000000..207aa90f --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5192e1d4e2a5e3c458d84533f8fa1570 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime.meta new file mode 100644 index 00000000..41e3397f --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf9d2fdb3a18bed4383860d25872c0ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native.meta new file mode 100644 index 00000000..d2960aaf --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7429ae87efe08c8498d41370fef01fa2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone.meta new file mode 100644 index 00000000..62908f20 --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c26870ff805786e429c8ab8592364540 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/ARM64.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/ARM64.meta new file mode 100644 index 00000000..73cf8013 --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/ARM64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7ccdbf75c375bf42a12b1af425a162b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x64.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x64.meta new file mode 100644 index 00000000..9f0863f0 --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50203b4f2530a244082350f32f55bcd8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x86.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x86.meta new file mode 100644 index 00000000..131e94d1 --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x86.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c056233622915f3429c723fed86f3439 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/UserSettings/Layouts/default-6000.dwlt b/EintooAR/UserSettings/Layouts/default-6000.dwlt index 39eab7f6..c23faecb 100644 --- a/EintooAR/UserSettings/Layouts/default-6000.dwlt +++ b/EintooAR/UserSettings/Layouts/default-6000.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 15 + controlID: 243 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 16 + controlID: 76 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -168,11 +168,11 @@ MonoBehaviour: x: 0 y: 0 width: 1405 - height: 417 + height: 554 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 17 + controlID: 47 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,7 +192,7 @@ MonoBehaviour: x: 0 y: 0 width: 433 - height: 417 + height: 554 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 16} @@ -218,9 +218,9 @@ MonoBehaviour: x: 433 y: 0 width: 288 - height: 417 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} + height: 554 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -244,7 +244,7 @@ MonoBehaviour: x: 721 y: 0 width: 684 - height: 417 + height: 554 m_MinSize: {x: 52, y: 76} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 22} @@ -271,13 +271,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 417 + y: 554 width: 1405 - height: 516 + height: 379 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 187 + controlID: 77 draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -297,9 +297,9 @@ MonoBehaviour: x: 0 y: 0 width: 131 - height: 516 - m_MinSize: {x: 101, y: 126} - m_MaxSize: {x: 4001, y: 4026} + height: 379 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -323,7 +323,7 @@ MonoBehaviour: x: 131 y: 0 width: 791 - height: 516 + height: 379 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} m_ActualView: {fileID: 19} @@ -349,7 +349,7 @@ MonoBehaviour: x: 922 y: 0 width: 483 - height: 516 + height: 379 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} m_ActualView: {fileID: 20} @@ -405,9 +405,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 24 + y: 79 width: 432 - height: 391 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -422,9 +422,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 20280100 m_LastClickedID: 0 - m_ExpandedIDs: 88faffff4e1d01008a1d0100 + m_ExpandedIDs: e6f5ffff6ef9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -470,10 +470,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 434 - y: 24 + x: 433 + y: 79 width: 286 - height: 391 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1022,15 +1022,15 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 0, y: 0.18964171, z: 0.00000023841858} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 0, y: 0.18964171, z: 0.00000023841858} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1058,17 +1058,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -1076,17 +1076,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.04206977, y: -0.95709133, z: 0.20865029, w: 0.19665778} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.04206971, y: 0.95708996, z: -0.20865, w: -0.1966575} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 3.6547272 + m_Target: 10 speed: 2 - m_Value: 3.6547272 + m_Value: 10 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -1100,7 +1100,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.04206977, y: -0.95709133, z: 0.20865029, w: 0.19665778} m_LastSceneViewOrtho: 0 m_Viewpoint: m_SceneView: {fileID: 17} @@ -1135,9 +1135,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 24 + y: 633 width: 130 - height: 490 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1170,10 +1170,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 132 - y: 24 + x: 131 + y: 633 width: 789 - height: 490 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1196,7 +1196,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System + - Assets/Scenes m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1206,16 +1206,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: D:\UnityProject\EintooAR\EintooAR m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 120} - m_SelectedIDs: 6e1e0100 - m_LastClickedID: 73326 - m_ExpandedIDs: 00000000482a01009e460100a0460100a2460100a4460100a6460100a8460100aa460100ac460100ae460100b0460100b2460100b4460100b6460100b8460100ba460100bc460100be460100c0460100c2460100c4460100c6460100c8460100ca460100cc460100ce460100d0460100d2460100d4460100d6460100d8460100da460100dc460100de460100e0460100e2460100e4460100e6460100e8460100ea460100ec460100ee460100f0460100f2460100f4460100f6460100f8460100fa460100fc460100fe46010000470100024701000447010006470100084701000a470100 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: ba240100 + m_LastClickedID: 74938 + m_ExpandedIDs: 000000008a170100bc230100be230100c0230100c2230100c4230100c8230100ca230100cc230100ce230100d0230100d2230100d4230100d6230100d8230100da230100dc230100de230100e0230100e2230100e4230100e6230100e8230100ea230100ec230100ee230100f0230100f2230100f4230100f6230100f8230100fa230100fc230100fe23010000240100022401000424010006240100082401000a2401000c2401000e24010010240100122401001424010016240100182401001a2401001e240100202401002224010024240100262401002824010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1244,7 +1244,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000482a01009e460100a0460100a2460100a4460100a6460100a8460100aa460100ac460100ae460100b0460100b2460100b4460100b6460100b8460100ba460100bc460100be460100c0460100c2460100c4460100c6460100c8460100ca460100cc460100ce460100d0460100d2460100d4460100d6460100d8460100da460100dc460100de460100e0460100e2460100e4460100e6460100e8460100ea460100ec460100ee460100f0460100f2460100f4460100f6460100f8460100fa460100fc460100fe46010000470100024701000447010006470100084701000a470100 + m_ExpandedIDs: 000000008a170100bc230100be230100c0230100c2230100c4230100c6230100c8230100ca230100cc230100ce230100d0230100d2230100d4230100d6230100d8230100da230100dc230100de230100e0230100e2230100e4230100e6230100e8230100ea230100ec230100ee230100f0230100f2230100f4230100f6230100f8230100fa230100fc230100fe23010000240100022401000424010006240100082401000a2401000c2401000e24010010240100122401001424010016240100182401001a2401001c2401001e2401002024010022240100242401002624010028240100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1323,10 +1323,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 923 - y: 24 + x: 922 + y: 633 width: 481 - height: 490 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1366,9 +1366,9 @@ MonoBehaviour: m_IsLocked: 1 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: fa1f0100 - m_LastClickedID: 73722 - m_ExpandedIDs: 00000000482a01009e460100a0460100a2460100a4460100a6460100a8460100aa460100ac460100ae460100b0460100b2460100b4460100b6460100b8460100ba460100bc460100be460100c0460100c2460100c4460100c6460100c8460100ca460100cc460100ce460100d0460100d2460100d4460100d6460100d8460100da460100dc460100de460100e0460100e2460100e4460100e6460100e8460100ea460100ec460100ee460100f0460100f2460100f4460100f6460100f8460100fa460100fc460100fe46010000470100024701000447010006470100084701000a470100 + m_SelectedIDs: 7c250100 + m_LastClickedID: 75132 + m_ExpandedIDs: 000000008a170100bc230100be230100c0230100c2230100c4230100c6230100c8230100ca230100cc230100ce230100d0230100d2230100d4230100d6230100d8230100da230100dc230100de230100e0230100e2230100e4230100e6230100e8230100ea230100ec230100ee230100f0230100f2230100f4230100f6230100f8230100fa230100fc230100fe23010000240100022401000424010006240100082401000a2401000c2401000e24010010240100122401001424010016240100182401001a2401001c2401001e24010020240100222401002424010026240100282401009224010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1397,7 +1397,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000482a01009e460100a0460100a2460100a4460100a6460100a8460100aa460100ac460100ae460100b0460100b2460100b4460100b6460100b8460100ba460100bc460100be460100c0460100c2460100c4460100c6460100c8460100ca460100cc460100ce460100d0460100d2460100d4460100d6460100d8460100da460100dc460100de460100e0460100e2460100e4460100e6460100e8460100ea460100ec460100ee460100f0460100f2460100f4460100f6460100f8460100fa460100fc460100fe46010000470100024701000447010006470100084701000a470100 + m_ExpandedIDs: 000000008a170100bc230100be230100c0230100c2230100c4230100c6230100c8230100ca230100cc230100ce230100d0230100d2230100d4230100d6230100d8230100da230100dc230100de230100e0230100e2230100e4230100e6230100e8230100ea230100ec230100ee230100f0230100f2230100f4230100f6230100f8230100fa230100fc230100fe23010000240100022401000424010006240100082401000a2401000c2401000e24010010240100122401001424010016240100182401001a2401001c2401001e2401002024010022240100242401002624010028240100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1476,8 +1476,8 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1406 - y: 24 + x: 1405 + y: 79 width: 514 height: 907 m_SerializedDataModeController: @@ -1525,10 +1525,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 722 - y: 24 + x: 721 + y: 79 width: 682 - height: 391 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1573,7 +1573,7 @@ MonoBehaviour: m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 1 + m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 @@ -1585,22 +1585,22 @@ MonoBehaviour: x: 0 y: 21 width: 682 - height: 370 - m_Scale: {x: 0.27736133, y: 0.27736133} - m_Translation: {x: 341.00003, y: 184.99997} + height: 507 + m_Scale: {x: 0.38005996, y: 0.38005996} + m_Translation: {x: 341, y: 253.49998} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1229.4432 - y: -666.9999 - width: 2458.8865 - height: 1333.9999 + x: -897.22687 + y: -667 + width: 1794.4537 + height: 1334 m_MinimalGUI: 1 - m_defaultScale: 0.27736133 - m_LastWindowPixelSize: {x: 682, y: 391} + m_defaultScale: 0.38005996 + m_LastWindowPixelSize: {x: 682, y: 528} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000101000000000000 diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs index 266c8a5d..07f69a7a 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("APlugins")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00a6e36d35523d79a89300cf6c917134ef1a13f8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c3ad3113cf20a8ab062c6e6255582c0100b715d4")] [assembly: System.Reflection.AssemblyProductAttribute("APlugins")] [assembly: System.Reflection.AssemblyTitleAttribute("APlugins")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache index eaa2d496..a8af15b5 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache @@ -1 +1 @@ -ed381ebd5c32a32faf832484949ce803d6f194c5489cedafbac81b8d6b9e5a85 +43e0e398ae5e32ca33bc9471ee513ad5e696e66cc472ec5ec0a9f87ef8721ace diff --git a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info index 588b4605..97da5c2b 100644 --- a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info +++ b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17445925597721448 \ No newline at end of file diff --git a/GameServer/Server/APlugins/obj/rider.project.restore.info b/GameServer/Server/APlugins/obj/rider.project.restore.info index 588b4605..9b22325a 100644 --- a/GameServer/Server/APlugins/obj/rider.project.restore.info +++ b/GameServer/Server/APlugins/obj/rider.project.restore.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17446243488696810 \ No newline at end of file diff --git a/GameServer/Server/Entity/Model/Chat/ChatManagementComponent.cs b/GameServer/Server/Entity/Model/Chat/ChatManagementComponent.cs new file mode 100644 index 00000000..7be35bd5 --- /dev/null +++ b/GameServer/Server/Entity/Model/Chat/ChatManagementComponent.cs @@ -0,0 +1,8 @@ + + +using Fantasy.Entitas; + +public class ChatManagementComponent : Entity +{ + +} \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs index 7f548447..3e59bce2 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Entity")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00a6e36d35523d79a89300cf6c917134ef1a13f8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c3ad3113cf20a8ab062c6e6255582c0100b715d4")] [assembly: System.Reflection.AssemblyProductAttribute("Entity")] [assembly: System.Reflection.AssemblyTitleAttribute("Entity")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache index 8f97b826..1290b619 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache @@ -1 +1 @@ -cd771dd1f1c553ef3c85e59048e5aad5c2a553d29f985d3eaa9e64dd9baf70c5 +13f3104b25ee7b72457ad6eda84a41b94fdf1d507da74741102c9e9ab8783363 diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache index 48debd18..c9638d68 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Entity/obj/rider.project.model.nuget.info b/GameServer/Server/Entity/obj/rider.project.model.nuget.info index 588b4605..59deb38f 100644 --- a/GameServer/Server/Entity/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Entity/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17445925597890487 \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/rider.project.restore.info b/GameServer/Server/Entity/obj/rider.project.restore.info index 588b4605..39f97ac1 100644 --- a/GameServer/Server/Entity/obj/rider.project.restore.info +++ b/GameServer/Server/Entity/obj/rider.project.restore.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17446243488702004 \ No newline at end of file diff --git a/GameServer/Server/Hotfix/OnCreateScene_InitEvent.cs b/GameServer/Server/Hotfix/OnCreateScene_InitEvent.cs index a8cd923a..b381a4cd 100644 --- a/GameServer/Server/Hotfix/OnCreateScene_InitEvent.cs +++ b/GameServer/Server/Hotfix/OnCreateScene_InitEvent.cs @@ -20,6 +20,10 @@ public class OnCreateScene_InitEvent : AsyncEventSystem scene.AddComponent(); Log.Debug("初始网关（Gate）服务器组件"); break; + + case SceneType.Chat: + scene.AddComponent(); + break; } await FTask.CompletedTask; diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs index 3b7700f2..1432748b 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Hotfix")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00a6e36d35523d79a89300cf6c917134ef1a13f8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c3ad3113cf20a8ab062c6e6255582c0100b715d4")] [assembly: System.Reflection.AssemblyProductAttribute("Hotfix")] [assembly: System.Reflection.AssemblyTitleAttribute("Hotfix")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache index 4cfa4a8b..2e6832f0 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache @@ -1 +1 @@ -a36d5d41d8f4e08e36f3e6309ff8b6b3fb7e510781b5c5c020488d8c803f82cc +2e090cacf21634ed778c4b58a890448889cdadc59f62e57779400d185d6066b3 diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache index e242566f..fdeed505 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info index 588b4605..74458a75 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17445925598071222 \ No newline at end of file diff --git a/GameServer/Server/Hotfix/obj/rider.project.restore.info b/GameServer/Server/Hotfix/obj/rider.project.restore.info index 588b4605..18de19b0 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.restore.info +++ b/GameServer/Server/Hotfix/obj/rider.project.restore.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17446243488709721 \ No newline at end of file diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs index 36f95885..1c3e2e99 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Main")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00a6e36d35523d79a89300cf6c917134ef1a13f8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c3ad3113cf20a8ab062c6e6255582c0100b715d4")] [assembly: System.Reflection.AssemblyProductAttribute("Main")] [assembly: System.Reflection.AssemblyTitleAttribute("Main")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache index 149f8db4..e03edb38 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache @@ -1 +1 @@ -932444fdca88a32611b190d092645e2435aeae2d3efa5589228c3bade3e0b60a +394efb132679b18da73e9a918dca67fa1b1184f157208760d57a95961da52a2e diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache index d502bfd9..1056973f 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache and b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Main/obj/rider.project.model.nuget.info b/GameServer/Server/Main/obj/rider.project.model.nuget.info index 1bfc59f1..9fb52111 100644 --- a/GameServer/Server/Main/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Main/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17442722924402245 \ No newline at end of file +17445925598181296 \ No newline at end of file diff --git a/GameServer/Server/Main/obj/rider.project.restore.info b/GameServer/Server/Main/obj/rider.project.restore.info index 1bfc59f1..18de19b0 100644 --- a/GameServer/Server/Main/obj/rider.project.restore.info +++ b/GameServer/Server/Main/obj/rider.project.restore.info @@ -1 +1 @@ -17442722924402245 \ No newline at end of file +17446243488709721 \ No newline at end of file