From 76a2bc3d971be71ee37b658803bc593e51982551 Mon Sep 17 00:00:00 2001 From: SnowShow Date: Fri, 28 Mar 2025 13:16:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=86=97=E4=BD=99=E6=96=87=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=202.=20=E4=BD=BF=E7=94=A8OSA=20=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=88=B6=E4=BD=9C=E8=AF=86=E5=88=AB=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E7=9A=84=20UI=E6=98=BE=E7=A4=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/UIRaw_Atlas_AR_Commom.spriteatlas | 4 + .../UI/AR/ARTrace/UIWindARTrace.prefab | 6 +- .../UI/AR/ARTrace/UIWindTraceLibrary.prefab | 195 +++++- .../Assets/AssetRaw/UI/AR/UIARManager.prefab | 595 ------------------ EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab | 595 ------------------ .../Assets/AssetRaw/UI/AR/UIHome.prefab.meta | 7 - .../UIRaw/Atlas/AR/Commom/UICommom_Return.png | Bin 0 -> 302 bytes .../Atlas/AR/Commom/UICommom_Return.png.meta | 169 +++++ .../RunTime/ARTrackSingleImageRuntimeData.cs | 10 + .../ARTrackSingleImageRuntimeData.cs.meta | 3 + .../Manager/ARTrack/ARTrackManager.cs | 201 +----- .../System/ARBrochureHomeSystem.cs | 4 - .../AR Brochure/System/ARTrackSystem.cs | 1 + .../AR Brochure/System/DataConfigSystem.cs | 283 +-------- .../UI/ARTrack/UIWindTraceLibrary.cs | 27 +- .../UI/ARTrack/Widget/UIARTrackScrollView.cs | 134 +++- .../Resources/EssentialKitSettings.asset | 171 +++++ .../EssentialKitSettings.asset.meta} | 5 +- .../UserSettings/EditorUserSettings.asset | 8 +- .../UserSettings/Layouts/default-6000.dwlt | 14 +- GameServer/Server/APlugins/APlugins.csproj | 2 +- .../obj/APlugins.csproj.nuget.dgspec.json | 12 +- .../obj/Debug/net9.0/APlugins.AssemblyInfo.cs | 2 +- .../net9.0/APlugins.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../obj/Debug/net9.0/APlugins.assets.cache | Bin 15845 -> 15845 bytes .../APlugins.csproj.AssemblyReference.cache | Bin 7279 -> 7279 bytes .../Server/APlugins/obj/project.assets.json | 44 +- .../Server/APlugins/obj/project.nuget.cache | 10 +- .../APlugins/obj/project.packagespec.json | 2 +- .../obj/rider.project.model.nuget.info | 2 +- .../APlugins/obj/rider.project.restore.info | 2 +- GameServer/Server/Entity/Entity.csproj | 2 +- .../obj/Debug/net9.0/Entity.AssemblyInfo.cs | 2 +- .../net9.0/Entity.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../obj/Debug/net9.0/Entity.assets.cache | Bin 18077 -> 18077 bytes .../Entity.csproj.AssemblyReference.cache | Bin 8660 -> 8542 bytes .../obj/Entity.csproj.nuget.dgspec.json | 26 +- .../Server/Entity/obj/project.assets.json | 76 +-- .../Server/Entity/obj/project.nuget.cache | 14 +- .../Entity/obj/project.packagespec.json | 2 +- .../Entity/obj/rider.project.model.nuget.info | 2 +- .../Entity/obj/rider.project.restore.info | 2 +- .../obj/Debug/net9.0/Hotfix.AssemblyInfo.cs | 2 +- .../net9.0/Hotfix.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../obj/Debug/net9.0/Hotfix.assets.cache | Bin 17653 -> 17653 bytes .../Hotfix.csproj.AssemblyReference.cache | Bin 9682 -> 8771 bytes .../obj/Hotfix.csproj.nuget.dgspec.json | 38 +- .../Server/Hotfix/obj/project.assets.json | 74 +-- .../Server/Hotfix/obj/project.nuget.cache | 14 +- .../Hotfix/obj/project.packagespec.json | 2 +- .../Hotfix/obj/rider.project.model.nuget.info | 2 +- .../Hotfix/obj/rider.project.restore.info | 2 +- .../obj/Debug/net9.0/Main.AssemblyInfo.cs | 2 +- .../net9.0/Main.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Main/obj/Debug/net9.0/Main.assets.cache | Bin 18511 -> 18511 bytes .../Main.csproj.AssemblyReference.cache | Bin 11529 -> 9662 bytes .../Main/obj/Main.csproj.nuget.dgspec.json | 58 +- .../Server/Main/obj/project.assets.json | 130 ++-- .../Server/Main/obj/project.nuget.cache | 14 +- .../Server/Main/obj/project.packagespec.json | 2 +- .../Main/obj/rider.project.model.nuget.info | 2 +- .../Main/obj/rider.project.restore.info | 2 +- 66 files changed, 975 insertions(+), 2019 deletions(-) delete mode 100644 EintooAR/Assets/AssetRaw/UI/AR/UIARManager.prefab delete mode 100644 EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab delete mode 100644 EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab.meta create mode 100644 EintooAR/Assets/AssetRaw/UIRaw/Atlas/AR/Commom/UICommom_Return.png create mode 100644 EintooAR/Assets/AssetRaw/UIRaw/Atlas/AR/Commom/UICommom_Return.png.meta create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Data/RunTime/ARTrackSingleImageRuntimeData.cs create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Data/RunTime/ARTrackSingleImageRuntimeData.cs.meta create mode 100644 EintooAR/Assets/Resources/EssentialKitSettings.asset rename EintooAR/Assets/{AssetRaw/UI/AR/UIARManager.prefab.meta => Resources/EssentialKitSettings.asset.meta} (52%) diff --git a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_AR_Commom.spriteatlas b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_AR_Commom.spriteatlas index 53bf0e75..a63b3ae5 100644 --- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_AR_Commom.spriteatlas +++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_AR_Commom.spriteatlas @@ -72,6 +72,7 @@ SpriteAtlas: variantMultiplier: 1 packables: - {fileID: 21300000, guid: a5157f110b47f09469aea3f606175e81, type: 3} + - {fileID: 21300000, guid: ddbb7899c426fdc4b93a4a43fe952dac, type: 3} - {fileID: 21300000, guid: 6c7f504e0c814d34699687c824eadbff, type: 3} - {fileID: 21300000, guid: 4834283cd094d8d41956efbfb0fa4183, type: 3} - {fileID: 21300000, guid: 73934a3f9b0a04445a9721acc85643c5, type: 3} @@ -84,6 +85,7 @@ SpriteAtlas: cachedData: {fileID: 0} packedSpriteRenderDataKeys: - a5157f110b47f09469aea3f606175e81: 21300000 + - ddbb7899c426fdc4b93a4a43fe952dac: 21300000 - d19a4f7a6fee3ab44abd9a2b780440b0: 21300000 - 4834283cd094d8d41956efbfb0fa4183: 21300000 - dc58c79c70155bb42aa361976cdcd4b1: 21300000 @@ -94,6 +96,7 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: a5157f110b47f09469aea3f606175e81, type: 3} + - {fileID: 21300000, guid: ddbb7899c426fdc4b93a4a43fe952dac, type: 3} - {fileID: 21300000, guid: d19a4f7a6fee3ab44abd9a2b780440b0, type: 3} - {fileID: 21300000, guid: 4834283cd094d8d41956efbfb0fa4183, type: 3} - {fileID: 21300000, guid: dc58c79c70155bb42aa361976cdcd4b1, type: 3} @@ -103,6 +106,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 73934a3f9b0a04445a9721acc85643c5, type: 3} m_PackedSpriteNamesToIndex: - Dot-32 + - UICommom_Return - UIIcon_home - UIIcon_arrow - UIIcon_love diff --git a/EintooAR/Assets/AssetRaw/UI/AR/ARTrace/UIWindARTrace.prefab b/EintooAR/Assets/AssetRaw/UI/AR/ARTrace/UIWindARTrace.prefab index 13f11868..2cf7d2b9 100644 --- a/EintooAR/Assets/AssetRaw/UI/AR/ARTrace/UIWindARTrace.prefab +++ b/EintooAR/Assets/AssetRaw/UI/AR/ARTrace/UIWindARTrace.prefab @@ -1021,8 +1021,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0000030398, y: -0.000030041} - m_SizeDelta: {x: 31.3649, y: 35.5667} + m_AnchoredPosition: {x: -4, y: 0} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1394309792026649416 CanvasRenderer: @@ -1052,7 +1052,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 481392fa15fa9e14fb6c5140d51bbd24, type: 3} + m_Sprite: {fileID: 21300000, guid: ddbb7899c426fdc4b93a4a43fe952dac, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/EintooAR/Assets/AssetRaw/UI/AR/ARTrace/UIWindTraceLibrary.prefab b/EintooAR/Assets/AssetRaw/UI/AR/ARTrace/UIWindTraceLibrary.prefab index b37d575a..6ac7b6c4 100644 --- a/EintooAR/Assets/AssetRaw/UI/AR/ARTrace/UIWindTraceLibrary.prefab +++ b/EintooAR/Assets/AssetRaw/UI/AR/ARTrace/UIWindTraceLibrary.prefab @@ -122,10 +122,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 518165484838362104} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &37609133202504770 CanvasRenderer: @@ -180,7 +180,7 @@ MonoBehaviour: m_CornerRadius: {x: 0, y: 0, z: 0} m_UniformCornerRadius: 0 m_Rectangle: - m_CornerRadius: {x: 32.15, y: 32.15, z: 32.15, w: 32.15} + m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} m_UniformCornerRadius: 1 m_Circle: m_Radius: 0 @@ -587,9 +587,9 @@ RectTransform: - {fileID: 1900102892603566785} m_Father: {fileID: 3932616186575741532} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 595.0602} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -749} m_SizeDelta: {x: 750, y: 1190.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4358934557245104796 @@ -713,17 +713,17 @@ MonoBehaviour: _ScrollSensivity: 100 _ScrollSensivityOnXAxis: 100 _ContentPadding: - m_Left: 10 - m_Right: 10 + m_Left: 75 + m_Right: 75 m_Top: 10 m_Bottom: 10 _Gravity: 1 - _ContentSpacing: 10 + _ContentSpacing: 100 _DefaultItemSize: 60 _ForwardDragToParents: 0 _ForwardDragSameDirectionAtBoundary: 0 - _DragEnabled: 1 - _ScrollEnabled: 1 + _DragEnabled: 0 + _ScrollEnabled: 0 _UseUnscaledTime: 1 _ItemTransversalSize: 0 _Effects: @@ -758,11 +758,11 @@ MonoBehaviour: _GalleryEffectAmount: 0 _GalleryEffectViewportPivot: 0.5 _Navigation: - _Enabled: 0 - _MaxSearchDepthForViewsHolder: 2 + _Enabled: 1 + _MaxSearchDepthForViewsHolder: 3 _ScrollDuration: 0.1 - _Centered: 0 - _AdditionalSpacingTowardsEdge: 0 + _Centered: 1 + _AdditionalSpacingTowardsEdge: 1.62 _Animation: _SmoothScrollType: 0 _Cancel: @@ -789,6 +789,9 @@ MonoBehaviour: _ItemPrefab: {fileID: 518165484838362104} _PrefabControlsDefaultItemSize: 1 _AlsoControlItemTransversalSize: 0 + m_currentIndex: 0 + m_isDragPlayAnimation: 0 + m_startPos: 0 --- !u!1 &2437648399828091087 GameObject: m_ObjectHideFlags: 0 @@ -1845,6 +1848,157 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 55 +--- !u!1 &4100709737554976498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4116704210455065469} + - component: {fileID: 8123413559767055868} + - component: {fileID: 8923707046025357531} + m_Layer: 0 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4116704210455065469 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4100709737554976498} + 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: 518165484838362104} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8123413559767055868 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4100709737554976498} + m_CullTransparentMesh: 1 +--- !u!114 &8923707046025357531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4100709737554976498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 + m_DrawShape: 3 + m_ImageType: 0 + m_MaterialMode: 0 + m_StrokeWidth: 0 + m_OutlineWidth: 0 + m_OutlineColor: {r: 0, g: 0, b: 0, a: 1} + m_FalloffDistance: 0.5 + m_ConstrainRotation: 1 + m_ShapeRotation: 0 + m_FlipHorizontal: 0 + m_FlipVertical: 0 + m_Triangle: + m_CornerRadius: {x: 0, y: 0, z: 0} + m_UniformCornerRadius: 0 + m_Rectangle: + m_CornerRadius: {x: 32.15, y: 32.15, z: 32.15, w: 32.15} + m_UniformCornerRadius: 1 + m_Circle: + m_Radius: 0 + m_FitRadius: 0 + m_Pentagon: + m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} + m_UniformCornerRadius: 0 + m_TipRadius: 0.001 + m_TipSize: 1 + m_Hexagon: + m_CornerRadius: {x: 1, y: 1, z: 1, w: 1} + m_UniformCornerRadius: 0 + m_TipSize: {x: 1, y: 1} + m_UniformTipSize: 0 + m_TipRadius: {x: 1, y: 1} + m_UniformTipRadius: 0 + m_NStarPolygon: + m_SideCount: 3 + m_Inset: 2 + m_CornerRadius: 0 + m_Offset: {x: 0, y: 0} + m_GradientEffect: + m_Enabled: 0 + m_GradientType: 0 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_CornerGradientColors: + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + m_Rotation: 0 --- !u!1 &4679644106268397573 GameObject: m_ObjectHideFlags: 0 @@ -3260,8 +3414,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 8.7, y: -0.58735} - m_SizeDelta: {x: 60.502, y: 61.1747} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4516788217294787214 CanvasRenderer: @@ -3291,7 +3445,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4834283cd094d8d41956efbfb0fa4183, type: 3} + m_Sprite: {fileID: 21300000, guid: ddbb7899c426fdc4b93a4a43fe952dac, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3316,7 +3470,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &518165484838362104 RectTransform: m_ObjectHideFlags: 0 @@ -3329,6 +3483,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4116704210455065469} - {fileID: 37609133202504768} m_Father: {fileID: 8579957863992341435} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/EintooAR/Assets/AssetRaw/UI/AR/UIARManager.prefab b/EintooAR/Assets/AssetRaw/UI/AR/UIARManager.prefab deleted file mode 100644 index 5f41f0c1..00000000 --- a/EintooAR/Assets/AssetRaw/UI/AR/UIARManager.prefab +++ /dev/null @@ -1,595 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4773964951984543575 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4773964951984543576} - - component: {fileID: 4773964951984543578} - - component: {fileID: 4773964951984543577} - m_Layer: 5 - m_Name: UIARManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4773964951984543576 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964951984543575} - 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: - - {fileID: 4773964952073438011} - - {fileID: 6707425267211417006} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &4773964951984543578 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964951984543575} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &4773964951984543577 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964951984543575} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 55 ---- !u!1 &4773964952073438010 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4773964952073438011} - - component: {fileID: 4773964952073438014} - - component: {fileID: 4773964952073438013} - - component: {fileID: 4773964952073438012} - m_Layer: 5 - m_Name: m_btnReturn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4773964952073438011 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964952073438010} - 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: - - {fileID: 4773964953373098168} - m_Father: {fileID: 4773964951984543576} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.07921666, y: 0.82006663} - m_AnchorMax: {x: 0.21775489, y: 0.9106} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4773964952073438014 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964952073438010} - m_CullTransparentMesh: 1 ---- !u!114 &4773964952073438013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964952073438010} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4773964952073438012 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964952073438010} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 4773964952073438013} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &4773964953373098167 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4773964953373098168} - - component: {fileID: 4773964953373098170} - - component: {fileID: 4773964953373098169} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4773964953373098168 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964953373098167} - 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: 4773964952073438011} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.17047237, y: 0.06038344} - m_AnchorMax: {x: 0.82952774, y: 0.93961656} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4773964953373098170 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964953373098167} - m_CullTransparentMesh: 1 ---- !u!114 &4773964953373098169 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4773964953373098167} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Return - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_sharedMaterial: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18.65 - m_fontSizeBase: 32.33 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8215380073901279141 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3626233938303034863} - - component: {fileID: 19784875784781311} - - component: {fileID: 8692141072841394534} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3626233938303034863 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8215380073901279141} - 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: 6707425267211417006} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.17942213, y: 0.11948502} - m_AnchorMax: {x: 0.82057804, y: 0.880515} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &19784875784781311 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8215380073901279141} - m_CullTransparentMesh: 1 ---- !u!114 &8692141072841394534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8215380073901279141} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Placed - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_sharedMaterial: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18.25 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8655269881374616321 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6707425267211417006} - - component: {fileID: 695369198767219656} - - component: {fileID: 5899064605354319697} - - component: {fileID: 8417509013724548863} - m_Layer: 0 - m_Name: m_btnPlaced - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6707425267211417006 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8655269881374616321} - 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: - - {fileID: 3626233938303034863} - m_Father: {fileID: 4773964951984543576} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.080597036, y: 0.7001997} - m_AnchorMax: {x: 0.21775378, y: 0.7878003} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &695369198767219656 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8655269881374616321} - m_CullTransparentMesh: 1 ---- !u!114 &5899064605354319697 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8655269881374616321} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8417509013724548863 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8655269881374616321} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5899064605354319697} - m_OnClick: - m_PersistentCalls: - m_Calls: [] diff --git a/EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab b/EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab deleted file mode 100644 index ffc94292..00000000 --- a/EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab +++ /dev/null @@ -1,595 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4381423868887959318 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4381423868887959319} - - component: {fileID: 4381423868887959314} - - component: {fileID: 4381423868887959313} - - component: {fileID: 4381423868887959312} - m_Layer: 5 - m_Name: m_btnAR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4381423868887959319 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423868887959318} - 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: - - {fileID: 4381423869774828386} - m_Father: {fileID: 4381423870940278381} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 155.78638} - m_SizeDelta: {x: 603.5603, y: 72.4272} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4381423868887959314 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423868887959318} - m_CullTransparentMesh: 1 ---- !u!114 &4381423868887959313 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423868887959318} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4381423868887959312 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423868887959318} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 4381423868887959313} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &4381423869489202026 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4381423869489202027} - - component: {fileID: 4381423869489202038} - - component: {fileID: 4381423869489202037} - - component: {fileID: 4381423869489202036} - m_Layer: 5 - m_Name: m_btnVirturalShowRoom - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4381423869489202027 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869489202026} - 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: - - {fileID: 4381423869778805617} - m_Father: {fileID: 4381423870940278381} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 52.929626} - m_SizeDelta: {x: 603.5603, y: 85.0014} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4381423869489202038 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869489202026} - m_CullTransparentMesh: 1 ---- !u!114 &4381423869489202037 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869489202026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4381423869489202036 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869489202026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 4381423869489202037} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &4381423869774828385 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4381423869774828386} - - component: {fileID: 4381423869774828396} - - component: {fileID: 4381423869774828387} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4381423869774828386 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869774828385} - 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: 4381423868887959319} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4381423869774828396 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869774828385} - m_CullTransparentMesh: 1 ---- !u!114 &4381423869774828387 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869774828385} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: AR - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_sharedMaterial: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 80 - m_fontSizeBase: 80 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 0 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 00000000 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4381423869778805616 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4381423869778805617} - - component: {fileID: 4381423869778805619} - - component: {fileID: 4381423869778805618} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4381423869778805617 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869778805616} - 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: 4381423869489202027} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4381423869778805619 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869778805616} - m_CullTransparentMesh: 1 ---- !u!114 &4381423869778805618 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423869778805616} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: VS - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_sharedMaterial: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 80 - m_fontSizeBase: 80 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 0 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 00000000 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4381423870940278370 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4381423870940278381} - - component: {fileID: 234876374656194370} - - component: {fileID: 3605465233451194004} - m_Layer: 5 - m_Name: UIHome - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4381423870940278381 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423870940278370} - 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: - - {fileID: 4381423868887959319} - - {fileID: 4381423869489202027} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &234876374656194370 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423870940278370} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &3605465233451194004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381423870940278370} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 55 diff --git a/EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab.meta b/EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab.meta deleted file mode 100644 index 463565f8..00000000 --- a/EintooAR/Assets/AssetRaw/UI/AR/UIHome.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 42dfedbfb07d3e94d98188b715532ae2 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/AR/Commom/UICommom_Return.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/AR/Commom/UICommom_Return.png new file mode 100644 index 0000000000000000000000000000000000000000..aadf3c9260faf0282908f2def11f98eeb203f0df GIT binary patch literal 302 zcmV+}0nz@6P)Nkl { - [ShowInInspector, ReadOnly] private ARTrackedImageManager m_ImgTrackedManager; - - - /// 缓存模型库 - private Dictionary m_DicModels = new Dictionary(); - [ShowInInspector]private List m_trackImages = new List(); // 识别图列表 - - private Dictionary imageToModelMap = new Dictionary(); + [ShowInInspector, ReadOnly] private ARTrackedImageManager m_arTrackedImageManager; + [ShowInInspector,LabelText("识别图列表")]public Dictionary m_trackImages = new Dictionary(); // 识别图列表 private List m_arTrackDataList = new List(); public override void Awake() { base.Awake(); - m_ImgTrackedManager = FindAnyObjectByType(); + m_arTrackedImageManager = FindAnyObjectByType(); } + #region 识别图 + + /// + /// 设置和下载识别图 + /// + /// public async UniTask SetAndHandleTrack(List ardata ) { var token = this.GetCancellationTokenOnDestroy(); @@ -36,182 +38,13 @@ namespace GameLogic { var trackImg = await ImageUtility.UnityWebDownloadTexture2D(arTrackData.trackImageUrl, token); if (trackImg == null) continue; - m_trackImages.Add(trackImg); + ARTrackSingleImageRuntimeData runtimeData = new ARTrackSingleImageRuntimeData(); + runtimeData._key = arTrackData.trackImageUrl; + runtimeData._texture = trackImg; + m_trackImages.Add(runtimeData._key, runtimeData); } } - - public override void Start() - { - base.Start(); - - - - - - - // // 初始化映射 - // for (int i = 0; i < images.Count; i++) - // { - // string imageName = images[i].name; - // if (i < models.Count) - // { - // imageToModelMap[imageName] = models[i]; - // } - // } - - // 动态添加识别图到库 - //AddImagesToLibrary(); - } - - void AddImagesToLibrary() - { - var library = m_ImgTrackedManager.referenceLibrary as MutableRuntimeReferenceImageLibrary; - if (library == null) - { - Debug.LogError("Reference library is not mutable."); - return; - } - - foreach (var image in m_trackImages) - { - - } - } - - void OnEnable() - { - //m_ImgTrackedManager.trackedImagesChanged += OnTrackedImagesChanged; - } - - void OnDisable() - { - //m_ImgTrackedManager.trackedImagesChanged -= OnTrackedImagesChanged; - } - - void OnTrackedImagesChanged(ARTrackedImagesChangedEventArgs eventArgs) - { - foreach (var trackedImage in eventArgs.added) - { - UpdateImage(trackedImage); - } - - foreach (var trackedImage in eventArgs.updated) - { - UpdateImage(trackedImage); - } - } - - void UpdateImage(ARTrackedImage trackedImage) - { - if (trackedImage.trackingState == TrackingState.Tracking) - { - string imageName = trackedImage.referenceImage.name; - if (imageToModelMap.TryGetValue(imageName, out GameObject model)) - { - model.SetActive(true); - model.transform.position = trackedImage.transform.position; - model.transform.rotation = trackedImage.transform.rotation; - } - } - } - - // public override void Start() - // { - // base.Start(); - // m_ImgTrackedManager = FindObjectOfType(); - // m_imageLibraryManager = GetComponent(); - // m_ImgTrackedManager.trackedImagesChanged += onTrackedImagesChanged; - // } - - // public override void OnDestroy() - // { - // base.OnDestroy(); - // m_ImgTrackedManager.trackedImagesChanged -= onTrackedImagesChanged; - // } - - // /// 识别图状态改变事件 - // private void onTrackedImagesChanged(ARTrackedImagesChangedEventArgs eventArgs) - // { - // foreach (var trackedImage in eventArgs.added) - // { - // onAddedListChanged(trackedImage); - // } - - // for (int i = 0; i < eventArgs.updated.Count; i++) - // { - // onUpdatedListChanged(eventArgs.updated[i]); - // } - - // for (int i = 0; i < eventArgs.removed.Count; i++) - // { - // onRemovedListChanged(eventArgs.removed[i]); - // } - // } - - // private void onAddedListChanged(ARTrackedImage referenceImage) - // { - // string targetImagesName = referenceImage.referenceImage.name; - - // if (m_imageLibraryManager == null || m_imageLibraryManager.m_DicTrackDatas == null) - // { - // Debug.LogError("Track data dictionary is not initialized."); - // return; - // } - - // if (!m_imageLibraryManager.m_DicTrackDatas.TryGetValue(targetImagesName, out var imagedata)) - // { - // Debug.LogError($"No matching track data found for: {targetImagesName}"); - // return; - // } - - // GameObject prefab = imagedata.m_trackModel; - // if (prefab == null) - // { - // Debug.LogError($"Prefab not found for tracked image: {targetImagesName}"); - // return; - // } - - // GameObject go = Instantiate(prefab, referenceImage.transform); - // go.SetActive(true); - - // // 添加到缓存 - // if (!m_DicModels.ContainsKey(targetImagesName)) - // { - // m_DicModels.Add(targetImagesName, go); - // } - // } - - // private void onUpdatedListChanged(ARTrackedImage referenceImage) - // { - // string targetImagesName = referenceImage.referenceImage.name; - - // // 检查是否有对应的模型缓存 - // if (!m_DicModels.ContainsKey(targetImagesName)) return; - - // GameObject model = m_DicModels[targetImagesName]; - // if (referenceImage.trackingState == TrackingState.Tracking) - // { - // model.SetActive(true); - // model.transform.position = referenceImage.transform.position; - // model.transform.rotation = referenceImage.transform.rotation; - // } - // else - // { - // model.SetActive(false); - // } - // } - - // private void onRemovedListChanged(ARTrackedImage referenceImage) - // { - // string targetImagesName = referenceImage.referenceImage.name; - - // if (m_DicModels.ContainsKey(targetImagesName)) - // { - // Destroy(m_DicModels[targetImagesName]); - // m_DicModels.Remove(targetImagesName); - // Debug.Log($"Removed and destroyed model for: {targetImagesName}"); - // } - // //Debug.Log("Removed:" + referenceImage.referenceImage.name); - // } + #endregion + } } \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARBrochureHomeSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARBrochureHomeSystem.cs index 3d5d6b5b..1723073b 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARBrochureHomeSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARBrochureHomeSystem.cs @@ -14,14 +14,10 @@ namespace GameLogic public async UniTaskVoid LoadHomeRoom() { - GameModule.UI.ShowUI(); await ApkInstallerSystem.Instance.CheckAndInstallApk(); GameModule.UI.CloseUI(); - await DataConfigSystem.Instance.Init(); - - await UniTask.Yield(); GameEvent.Send(LoadEventDefine.InitSceneAndData,"初始化完毕"); GameObject homeManager = new GameObject("HomeManager"); diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARTrackSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARTrackSystem.cs index 01c99d82..cbf3dcef 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARTrackSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARTrackSystem.cs @@ -16,6 +16,7 @@ namespace GameLogic public async UniTaskVoid LoadARRoom(ProjectToSceneSavedData _projectToSceneSavedData) { await UniTask.Yield(); + Log.Debug("ARTrackSystem LoadARRoom"); var manger = new GameObject("ARTrackManager"); var parent = GameObject.Find("XR Session Manager AR"); diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/DataConfigSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/DataConfigSystem.cs index 32b92aa2..a3917eff 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/DataConfigSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/DataConfigSystem.cs @@ -1,280 +1,42 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Best.HTTP; -using Best.HTTP.Request.Upload.Forms; -using Best.HTTP.Response; -using Best.HTTP.Shared.Compression.Crc; -using Best.HTTP.Shared.PlatformSupport.Memory; using Cysharp.Threading.Tasks; -using Newtonsoft.Json; using TEngine; -using UnityEngine; -using UnityEngine.Networking; namespace GameLogic { public partial class DataConfigSystem : BehaviourSingleton { - /// - /// JsonData - /// - public JsonData.ExhibitionHallData m_exhibitionHallData; - - public JsonData.CompanyFourTopData m_companyFourTopData; public JsonData.QueryAllCompanyData m_dataQueryAllCompany; - - - //private Dictionary m_dictCompanyUnitData = new Dictionary(); private Dictionary m_dictallProject = new Dictionary(); - - - - public CompanyUnitData m_fourTopProjectData = null; - - + /// + /// 初始化 + /// public async UniTask Init() { - await ConfigAndSetData(); await ConfigLanguage(); } - + + /// + /// 配置多语言 + /// private async UniTask ConfigLanguage() - { + { await GameModule.Localization.LoadLanguageTotalAsset(LanguagesSetting.LanguageCsv); GameEvent.Send(LoadEventDefine.InitSceneAndData, "语言表加载成功..."); await UniTask.CompletedTask; } - - #region 处理json 数据 - - public async UniTask ConfigAndSetData() - { - - Log.Info("测试"); - /*var fourTopProjectJson = await HttpHandleTool.BestHttpDownloadPostText(WebSettings._TopFourProjectRquestUrl,1, - (req,progress,length) => - { - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"数据下载中:{progress}/{length}"); - });*/ - var fourTopProjectJson = await HttpHandleTool.BestHttpDownloadPostText(WebSettings._TopFourProjectRquestUrl); - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"数据下载中"); - //HandleFourProjectTopData(fourTopProjectJson); - Log.Info("测试查询报空"); - - Log.Info(fourTopProjectJson); - - - if (m_exhibitionHallData == null) - { - m_exhibitionHallData = - await JsonHandleTool.HandleJsonToType(WebSettings._GlitfRquestUrl, - true); - } - - // if (m_companyFourTopData == null) - // { - // GameEvent.Send(LoadEventDefine.InitSceneAndData, "置顶公司数据加载欧中..."); - // m_companyFourTopData = - // await JsonHandleTool.HandleJsonToType( - // WebSettings._CompanyFourTopRquestUrl, false); - // } - - //GameEvent.Send(LoadEventDefine.InitSceneAndData, "公司数据加载欧中..."); - /*m_dataQueryAllCompany = - await JsonHandleTool.HandleJsonToType(WebSettings._QueryAllCompany, - false);*/ - /*var dataQueryAllCompanyJson = await HttpHandleTool.BestHttpDownloadPostText(WebSettings._QueryAllCompany,1, - (req,progress,length) => - { - //Log.Warning(req.Response.Data.s); - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"公司数据加载欧中:{MathUtil.ByteSizeToMb(progress)}"); - });*/ - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"公司数据加载欧中"); - var dataQueryAllCompanyJson = await HttpHandleTool.UnityWebRequestPostText(WebSettings._QueryAllCompany); - Log.Info("m_dataQueryAllCompany 下载成功"); - m_dataQueryAllCompany = JsonUtility.FromJson(dataQueryAllCompanyJson); - - - - - /*json = await HttpHandleTool.BestHttpDownloadPostText(WebSettings._AllProjectProjectWx,5, - (req,progress,length) => - { - - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"所有资源地址加载{MathUtil.ByteSizeToMb(progress)}MB"); - }, (req,resp,stream) => - { - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"所有资源地址加载{0}MB"); - });*/ - - - #region CheckAndDownloadData检测 下载 - - string jsonPath = Path.Combine(Application.persistentDataPath, "alldata.json"); - string json = null; - - #endregion - - - if (File.Exists(jsonPath)) - { - json = File.ReadAllText(jsonPath); - ComplareJson().Forget(); - } - else - { - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"所有资源下载中..."); - json = await HttpHandleTool.UnityWebRequestGetText(WebSettings._AllProjectProjectWx); - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"资源加载完成"); - File.WriteAllText(jsonPath,json); - await UniTask.WaitForSeconds(1); - } - - if (json == string.Empty) - { - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"所有资源下载中..."); - json = await HttpHandleTool.UnityWebRequestGetText(WebSettings._AllProjectProjectWx); - GameEvent.Send(LoadEventDefine.InitSceneAndData, $"资源加载完成"); - File.WriteAllText(jsonPath,json); - await UniTask.WaitForSeconds(1); - } - - - Log.Debug(json); - - try - { - var classEntity = JsonUtility.FromJson(json); - - if (classEntity !=null) - { - var list = classEntity.data; - for (int i = 0; i < list.Count; i++) - { - var name = list[i]?.userInfoVo?.companyName; - // if(m_dictCompanyUnitData.ContainsKey(name)) - // { - // m_dictCompanyUnitData[name] = list[i]; - // } - // else - // { - // m_dictCompanyUnitData.Add(name,list[i]); - // } - - } - GameEvent.Send(LoadEventDefine.InitSceneAndData, "加载完毕"); - } - } - catch - { - Log.Warning("公司实体数据 出现问题"); - GameEvent.Send(LoadEventDefine.InitSceneAndData, "加载完毕"); - } - - - } - - private static async UniTask ComplareJson() - { - string jsonPath = Path.Combine(Application.persistentDataPath, "alldata.json");; - string json = null; - json = await HttpHandleTool.UnityWebRequestPostText(WebSettings._AllProjectProjectWxEintoo); - File.WriteAllText(jsonPath,json); - Log.Warning("本地文件下载初始化完成"); - } - - - int ConsumeDownloadStream(BlockingDownloadContentStream blockingStream) - { - var crc = new CRC32(); - - try - { - while (!blockingStream.IsCompleted) - { - // Take out a segment from the downloaded - if (blockingStream.TryTake(out var buffer)) - { - try - { - // In this case content processing is just calculating the CRC checksum of the data. - crc.SlurpBlock(buffer.Data, buffer.Offset, buffer.Count); - } - finally - { - BufferPool.Release(buffer); - } - } - } - } - finally - { - blockingStream.Dispose(); - } - - return crc.Crc32Result; - } - public int GetGLTFDataListCount() - { - if (m_exhibitionHallData != null) - { - return m_exhibitionHallData.data.Count; - } - - return 0; - } - - public List GetDataListFromJson() - { - var type = typeof(T); - if (type == null) return null; - - // 使用 typeof(T) == typeof(YourType) 进行类型比较 - if (type == typeof(JsonData.ExhibitionHall)) - { - return m_exhibitionHallData.data as List; - } - else if (type == typeof(JsonData.CompanyTopData)) - { - return m_companyFourTopData.data as List; - } - - return null; - } - - #region 查询公司数据 - public List GetCompanyListFromIndustry(int industryid) { if (m_dataQueryAllCompany != null) { - // Log.Warning(m_dataQueryAllCompany.data.Count); + // Log.Warning(m_dataQueryAllCompany.data.Count); var list = m_dataQueryAllCompany.data.FindAll(x => x.industry == industryid); return list; } - return null; } - public List GetAllCompanyListFromIndustry() - { - if (m_dataQueryAllCompany != null) - { - //Log.Warning(m_dataQueryAllCompany.data.Count); - var list = m_dataQueryAllCompany.data.FindAll(x =>(x.industry != null&& x.industry != 0 )); - return list; - } - - return null; - } - - #endregion - - - public List GetAllCompanyListData() { if (m_dataQueryAllCompany != null) @@ -304,32 +66,5 @@ namespace GameLogic return null; } - - #endregion - - - #region 四个置顶数据处理 - private void HandleFourProjectTopData(string fourTopProjectJson) - { - if (!string.IsNullOrEmpty(fourTopProjectJson)) - { - var companyData = JsonUtility.FromJson(fourTopProjectJson); - CompanyUnitData fourTopProject = companyData.data.list[0]; - - } - } - - - - - #endregion - - - - - } - - - } \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/UIWindTraceLibrary.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/UIWindTraceLibrary.cs index f53df37f..8cdff773 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/UIWindTraceLibrary.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/UIWindTraceLibrary.cs @@ -19,10 +19,8 @@ namespace GameLogic private Button m_btnAll; private Button m_btntraceSaveLocalImage; private Button m_btnDirectShow; - private UIARTrackScrollView m_trackScrollerView; private ProjectToSceneSavedData _currentProjectToSceneSavedData; - private List m_widgetslist = new List(); protected override void ScriptGenerator() { @@ -86,28 +84,9 @@ namespace GameLogic private void SetUpComponentByData(ProjectData projectData) { - - - // m_trackScrollerView.SetUp(); - // var arlibrary = ARTrackImageLibraryManager.Instance; - // if (arlibrary != null) - // { - // if (arlibrary.m_listimageTrackDatas != null && arlibrary.m_listimageTrackDatas.Count > 0) - // { - // foreach (var trackdata in arlibrary.m_listimageTrackDatas) - // { - // // var widget = - // // CreateWidgetByPath(m_trackScrollerView.transform.GetChild(0).transform, - // // "UIWidgetTrackCard"); - // // m_trackScrollerView.Elements.Add(widget.rectTransform); - // // widget.SetUp(trackdata.Texture); - // // widget.gameObject.name = trackdata.Name; - // // m_widgetslist.Add(widget); - // } - // } - // - // m_trackScrollerView.gameObject.SetActive(true); - // } + var arTrackManager = ARTrackManager.Instance; + if(arTrackManager == null) return; + m_trackScrollerView.SetUp(arTrackManager.m_trackImages); } protected override void RegisterEvent() diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/Widget/UIARTrackScrollView.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/Widget/UIARTrackScrollView.cs index 7fb61e04..7c2a68ee 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/Widget/UIARTrackScrollView.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/Widget/UIARTrackScrollView.cs @@ -35,6 +35,7 @@ using Com.ForbiddenByte.OSA.Core; using Com.ForbiddenByte.OSA.CustomParams; using Com.ForbiddenByte.OSA.DataHelpers; using GameLogic; +using UnityEngine.EventSystems; // You should modify the namespace to your own or - if you're sure there won't ever be conflicts - remove it altogether namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists @@ -47,6 +48,10 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists // Can be iterated and can also have its elements accessed by the [] operator public SimpleDataHelper Data { get; private set; } + public List m_cardModels = new List(); + public int m_currentIndex = 0; + public bool m_isDragPlayAnimation = false; + public float m_startPos = 0; #region OSA implementation protected override void Start() @@ -60,6 +65,7 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists /* RetrieveDataAndUpdate(500); */ + SetItems(m_cardModels); } // This is called initially, as many times as needed to fill the viewport, @@ -90,13 +96,11 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists // index of item that should be represented by this views holder. You'll use this index // to retrieve the model from your data set /* - MyListItemModel model = Data[newOrRecycled.ItemIndex]; - - newOrRecycled.backgroundImage.color = model.color; - newOrRecycled.titleText.text = model.title + " #" + newOrRecycled.ItemIndex; + */ + UICardModel model = Data[newOrRecycled.ItemIndex]; + newOrRecycled.UpdateModel(model); } - // This is the best place to clear an item's views in order to prepare it from being recycled, but this is not always needed, // especially if the views' values are being overwritten anyway. Instead, this can be used to, for example, cancel an image // download request, if it's still in progress when the item goes out of the viewport. @@ -203,25 +207,104 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists Data.InsertItemsAtEnd(newItems); } - public void SetUp(List arTrackAllData) + public void SetUp(Dictionary arTrackImages) { - List newItems = new List(); - foreach (var arTrackData in arTrackAllData) + + m_cardModels.Clear(); + foreach (var (_,arTrackData) in arTrackImages) { + UICardModel cardModel = new UICardModel(); + cardModel.m_data = arTrackData; + m_cardModels.Add(cardModel); + } + } + + + + #region 滑动定位 + + + + protected override void OnEnable() + { + base.OnEnable(); + m_isDragPlayAnimation = false; + m_currentIndex = 0; + //ScrollTo(0); + } + + public override void OnBeginDrag(PointerEventData eventData) + { + base.OnBeginDrag(eventData); + m_startPos = eventData.position.x; + } + + public override void OnEndDrag(PointerEventData eventData) + { + base.OnEndDrag(eventData); + LocationToItem(eventData); + } + + private void LocationToItem(PointerEventData eventData) + { + if (m_isDragPlayAnimation) return; + + bool isleft = eventData.position.x < m_startPos ; + //bool isright = eventData.position.x - _startPos < 0; + int totalItem = GetItemsCount(); + Debug.Log(totalItem); + if (isleft) + { + m_currentIndex += 1; + Debug.Log($"right"); + if (m_currentIndex > totalItem - 1) + { + m_currentIndex= totalItem - 1; + return; + } + + m_isDragPlayAnimation = true; + SmoothScrollTo(m_currentIndex,0.5f,0.1f,0,null, () => + { + m_isDragPlayAnimation = false; + }); + } + else + { + m_currentIndex -= 1; + Debug.Log($"left"); + if (m_currentIndex < 0) + { + m_currentIndex= 0; + return; + } + m_isDragPlayAnimation = true; + SmoothScrollTo(m_currentIndex,0.5f,0.1f,0,null, () => + { + m_isDragPlayAnimation = false; + }); + } } + + #endregion + + public UICardModel GetCurrentModel() + { + UICardModel model = m_cardModels[m_currentIndex]; + return model; + } } + // Class containing the data associated with an item public class UICardModel { - /* - public string title; - public Color color; - */ + public ARTrackSingleImageRuntimeData m_data; + } @@ -229,17 +312,14 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists // Your views holder should extend BaseItemViewsHolder for ListViews and CellViewsHolder for GridViews public class UITrackCardItemViewsHolder : BaseItemViewsHolder { - /* - public Text titleText; - public Image backgroundImage; - */ - - + public Image m_icon; + public RectTransform BackGround; // Retrieving the views from the item's root GameObject public override void CollectViews() { base.CollectViews(); - + root.GetComponentAtPath("m_icon", out m_icon); + root.GetComponentAtPath("BackGround", out BackGround); // GetComponentAtPath is a handy extension method from frame8.Logic.Misc.Other.Extensions // which infers the variable's component from its type, so you won't need to specify it yourself /* @@ -248,6 +328,22 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists */ } + public void UpdateModel(UICardModel model) + { + Sprite trackSprite = Sprite.Create(model.m_data._texture, new Rect(0, 0, model.m_data._texture.width, model.m_data._texture.height), new Vector2(0.5f, 0.5f)); + m_icon.sprite = trackSprite; + // 适配图片：固定宽度，按原始纹理比例计算高度 + // 获取纹理的原始宽高比 + float textureAspectRatio = model.m_data._texture.height /(float) model.m_data._texture.width; + + // 保持UI元素宽度不变，根据纹理宽高比计算高度 + m_icon.rectTransform.sizeDelta = new Vector2(m_icon.rectTransform.sizeDelta.x, m_icon.rectTransform.sizeDelta.x * textureAspectRatio); + + + // var trackSprite = Sprite.Create(model.m_data._texture,) + // m_icon.sprite = + } + // Override this if you have children layout groups or a ContentSizeFitter on root that you'll use. // They need to be marked for rebuild when this callback is fired /* diff --git a/EintooAR/Assets/Resources/EssentialKitSettings.asset b/EintooAR/Assets/Resources/EssentialKitSettings.asset new file mode 100644 index 00000000..bac6896f --- /dev/null +++ b/EintooAR/Assets/Resources/EssentialKitSettings.asset @@ -0,0 +1,171 @@ +%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: 5e0ea44ec561e4ff9a51024a414c5e02, type: 3} + m_Name: EssentialKitSettings + m_EditorClassIdentifier: + m_applicationSettings: + m_logLevel: 3 + m_appStoreIds: + m_ios: + m_tvos: + m_android: + m_usagePermissionSettings: + m_addressBookUsagePermission: + m_description: $productName uses contacts. + m_descriptionOverrides: + m_ios: + m_tvos: + m_android: + m_cameraUsagePermission: + m_description: $productName uses camera. + m_descriptionOverrides: + m_ios: + m_tvos: + m_android: + m_galleryUsagePermission: + m_description: $productName uses gallery. + m_descriptionOverrides: + m_ios: + m_tvos: + m_android: + m_galleryWritePermission: + m_description: $productName wants to write to gallery. + m_descriptionOverrides: + m_ios: + m_tvos: + m_android: + m_locationWhenInUsePermission: + m_description: $productName would like to user your location. + m_descriptionOverrides: + m_ios: + m_tvos: + m_android: + m_accessFriendsPermission: + m_description: $productName wants to access friends. + m_descriptionOverrides: + m_ios: + m_tvos: + m_android: + m_addressBookSettings: + m_isEnabled: 1 + m_defaultImage: {fileID: 0} + m_appUpdaterSettings: + m_isEnabled: 1 + m_defaultPromptTitle: + m_defaultPromptMessage: + m_nativeUISettings: + m_isEnabled: 1 + m_customUICollection: + m_rendererPrefab: {fileID: 114882653979984282, guid: b8b2730da8ec14db686316d122a0939e, type: 3} + m_alertDialogPrefab: {fileID: 114719650402599042, guid: 0bea496bdcd2d41ebb1104db0fd905dc, type: 3} + m_datePickerPrefab: {fileID: 0} + m_sharingServicesSettings: + m_isEnabled: 1 + m_cloudServicesSettings: + m_isEnabled: 1 + m_androidProperties: + m_playServicesApplicationId: + m_gameServicesSettings: + m_isEnabled: 1 + m_leaderboards: [] + m_achievements: [] + m_showAchievementCompletionBanner: 1 + m_allowFriendsAccess: 1 + m_androidProperties: + m_playServicesApplicationId: + m_serverClientId: + m_forceRefreshToken: 1 + m_showErrorDialogs: 1 + m_billingServicesSettings: + m_isEnabled: 1 + m_products: [] + m_autoFinishTransactions: 1 + m_androidProperties: + m_publicKey: + m_networkServicesSettings: + m_isEnabled: 1 + m_hostAddress: + m_ipv4: 8.8.8.8 + m_ipv6: 0:0:0:0:0:FFFF:0808:0808 + m_autoStartNotifier: 1 + m_pingSettings: + m_maxRetryCount: 3 + m_timeGapBetweenPolling: 2 + m_timeOutPeriod: 60 + m_port: 53 + m_webViewSettings: + m_isEnabled: 1 + m_androidProperties: + m_usesCamera: 0 + m_usesMicrophone: 0 + m_allowBackNavigationKey: 1 + m_notificationServicesSettings: + m_isEnabled: 1 + m_presentationOptions: 7 + m_usesLocationBasedNotification: 0 + m_pushNotificationServiceType: 1 + m_androidProperties: + m_needsBigStyle: 0 + m_allowVibration: 1 + m_whiteSmallIcon: {fileID: 0} + m_colouredSmallIcon: {fileID: 0} + m_allowNotificationDisplayWhenForeground: 0 + m_accentColor: '#FFFFFF' + m_payloadKeys: + m_contentTitle: content_title + m_contentText: content_text + m_tickerText: ticker_text + m_userInfo: user_info + m_tag: tag + m_badge: badge + m_priority: priority + m_sound: sound + m_bigPicture: big_picture + m_largeIcon: large_icon + m_allowExactTimeScheduling: 0 + m_canIgnoreDozeMode: 0 + m_mediaServicesSettings: + m_isEnabled: 1 + m_usesCameraForImageCapture: 1 + m_usesCameraForVideoCapture: 0 + m_savesFilesToPhotoGallery: 1 + m_savesFilesToCustomDirectories: 1 + m_deepLinkServicesSettings: + m_isEnabled: 1 + m_iosProperties: + m_customSchemeUrls: [] + m_universalLinks: [] + m_androidProperties: + m_customSchemeUrls: [] + m_universalLinks: [] + m_utilitySettings: + m_isEnabled: 1 + m_rateMyAppSettings: + m_isEnabled: 1 + m_autoShow: 1 + m_allowReratingForNewVersion: 0 + m_confirmationDialogSettings: + m_canShow: 1 + m_promptTitle: Rate My App + m_promptDescription: If you enjoy using Native Plugins would you mind taking + a moment to rate it? It wont take more than a minute. Thanks for your support. + m_okButtonLabel: Ok + m_cancelButtonLabel: Cancel + m_remindLaterButtonLabel: Remind Me Later + m_canShowRemindMeLaterButton: 1 + m_contraintsSettings: + m_initialPromptConstraints: + m_minHours: 2 + m_minLaunches: 0 + m_repeatPromptConstraints: + m_minHours: 6 + m_minLaunches: 5 diff --git a/EintooAR/Assets/AssetRaw/UI/AR/UIARManager.prefab.meta b/EintooAR/Assets/Resources/EssentialKitSettings.asset.meta similarity index 52% rename from EintooAR/Assets/AssetRaw/UI/AR/UIARManager.prefab.meta rename to EintooAR/Assets/Resources/EssentialKitSettings.asset.meta index 263f3386..d6f78d7a 100644 --- a/EintooAR/Assets/AssetRaw/UI/AR/UIARManager.prefab.meta +++ b/EintooAR/Assets/Resources/EssentialKitSettings.asset.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: cabdc3f40be54b445a66e0e998e89209 -PrefabImporter: +guid: a8c8f24f5795ad04581be21f9014c1bf +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/EintooAR/UserSettings/EditorUserSettings.asset b/EintooAR/UserSettings/EditorUserSettings.asset index 1346c446..14b25bdf 100644 --- a/EintooAR/UserSettings/EditorUserSettings.asset +++ b/EintooAR/UserSettings/EditorUserSettings.asset @@ -24,14 +24,14 @@ EditorUserSettings: value: 075200535d530a5e0e5f5e7140725944134f4f7d79717465782d1b30b0e6363e flags: 0 RecentlyUsedSceneGuid-6: - value: 0606035f5c515b0d0e0a5a7213265d44414e1d2c2f782734782b4432b3e66d3b - flags: 0 - RecentlyUsedSceneGuid-7: value: 065706515d020b5e0e5b5b2647715b444e4f4a737b2c7f32292d4c65b4b2603b flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-7: value: 550702020750080c0b0b0e7a48750b44154f1a722d2d7e65752a1c61b5b8353d flags: 0 + RecentlyUsedSceneGuid-8: + value: 0606035f5c515b0d0e0a5a7213265d44414e1d2c2f782734782b4432b3e66d3b + flags: 0 RecentlyUsedSceneGuid-9: value: 02500105010d500359565b7616225a44474e4c7d7b2c27337b7f4d31b1b8666f flags: 0 diff --git a/EintooAR/UserSettings/Layouts/default-6000.dwlt b/EintooAR/UserSettings/Layouts/default-6000.dwlt index 34ddec66..66ff45bb 100644 --- a/EintooAR/UserSettings/Layouts/default-6000.dwlt +++ b/EintooAR/UserSettings/Layouts/default-6000.dwlt @@ -1130,7 +1130,7 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: 0.8162837, y: 0.5892077, z: 1090.548} speed: 2 m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 @@ -1182,9 +1182,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.124355 + m_Target: 5.234561 speed: 2 - m_Value: 12.124355 + m_Value: 10 m_Ortho: m_Target: 1 speed: 2 @@ -1317,7 +1317,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: ecdc0300 m_LastClickedID: 253164 - m_ExpandedIDs: 00000000e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100 + m_ExpandedIDs: 000000005c1a01005e1a0100601a0100621a0100641a0100661a0100681a0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1346,7 +1346,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100 + m_ExpandedIDs: 000000005c1a01005e1a0100601a0100621a0100641a0100661a0100681a0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1470,7 +1470,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 586} m_SelectedIDs: fcdd0300 m_LastClickedID: 253436 - m_ExpandedIDs: 00000000e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100 + m_ExpandedIDs: 000000005c1a01005e1a0100601a0100621a0100641a0100661a0100681a0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1499,7 +1499,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100 + m_ExpandedIDs: 000000005c1a01005e1a0100601a0100621a0100641a0100661a0100681a0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/GameServer/Server/APlugins/APlugins.csproj b/GameServer/Server/APlugins/APlugins.csproj index a743c4c1..e4cabbea 100644 --- a/GameServer/Server/APlugins/APlugins.csproj +++ b/GameServer/Server/APlugins/APlugins.csproj @@ -12,7 +12,7 @@ - + diff --git a/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json b/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json index b7c2b25d..d793d088 100644 --- a/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json +++ b/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": {} + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": {} }, "projects": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -68,7 +68,7 @@ }, "Microsoft.IdentityModel.Tokens": { "target": "Package", - "version": "[8.6.1, )" + "version": "[8.7.0, )" } }, "imports": [ 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 78b3cbf9..b09fe759 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+97396517dda7eb725da08aa889df20dc11364034")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8d9459c1734a4693b4a3984994643c336133b96f")] [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 031a4ea8..06a54280 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 @@ -a06af8c94b5c36b94a89cdcd70a321836b5d4922780265a22435f8ad903d564c +f1f34c275b484cfe5bf268cb5ddca7230f1291e2774506f221a37101849af89e diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.GeneratedMSBuildEditorConfig.editorconfig b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.GeneratedMSBuildEditorConfig.editorconfig index 9b2d5be9..dd74ff68 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.GeneratedMSBuildEditorConfig.editorconfig +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Plugins -build_property.ProjectDir = D:\TecentUGit\EintooAR\GameServer\Server\APlugins\ +build_property.ProjectDir = D:\UnityProject\EintooAR\GameServer\Server\APlugins\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.assets.cache b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.assets.cache index 537e9cee3109bae87400539a21d0cf2741a9d0c7..e25bed0e4848a8aeabcea2692469fd1ad10fa422 100644 GIT binary patch delta 220 zcmaD_{j^#mz}wxChk=1%WBIIuVw`W5e-7Y^Q(RHzAUCZ^X4$<@Yxc{(^Y->PdACvH zB`dSJp26gcN-C4rTL?^E$I3A|fGrFvra$=xTP$3@pPy}W61xdENMQ3!A$DfC%z6vn z$yY=pp?samF=7#LIgqZ0Vh&(kaBCuz%Ag9CpeS6V%*V$9G~ReJhmkVKL7Sf&#)DnB J+0%Ru8vrt4N`L?W delta 220 zcmaD_{j^#mz}wxChk=3NuAA_kV75#Zzc*SgXSo#8g{7jT-j)7P+oq7x%=zNlqm3Fb zS((lB3@2YyQklHoLSXVbR*uO5Y++C_{mD1jV&U@r{A`<(*iE=W0-I+Fu`|PE)?4sS zz9Je4GMd2c4K0X$p@y3%mjFdqR+Wg!w9_+%+ Ip5}Ad0E&S~U;qFB diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.AssemblyReference.cache b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.AssemblyReference.cache index 8d516fbd022e3c2946973a5aa340b5cf948e1dc3..45f611dddbfa5eb5982f0c36d2d0c91975bae971 100644 GIT binary patch delta 176 zcmaEF@!n!XDkrnKp26e+~r_oWK@|vpH~7X#>2+Q!N9=4K6!$O z+hkd;{fy?5A8@Eme#xgYS)JPnu6Y8tAh+rImr%{}V9gV_*-?LQ8=`viOTIQ<0IVW2&;S4c delta 166 zcmaEF@!n!XDkrm?a~ diff --git a/GameServer/Server/APlugins/obj/project.assets.json b/GameServer/Server/APlugins/obj/project.assets.json index c0f6e746..78d8c70e 100644 --- a/GameServer/Server/APlugins/obj/project.assets.json +++ b/GameServer/Server/APlugins/obj/project.assets.json @@ -136,7 +136,7 @@ "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets": {} } }, - "Microsoft.IdentityModel.Abstractions/8.6.1": { + "Microsoft.IdentityModel.Abstractions/8.7.0": { "type": "package", "compile": { "lib/net9.0/Microsoft.IdentityModel.Abstractions.dll": { @@ -149,10 +149,10 @@ } } }, - "Microsoft.IdentityModel.Logging/8.6.1": { + "Microsoft.IdentityModel.Logging/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "8.6.1" + "Microsoft.IdentityModel.Abstractions": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Logging.dll": { @@ -165,11 +165,11 @@ } } }, - "Microsoft.IdentityModel.Tokens/8.6.1": { + "Microsoft.IdentityModel.Tokens/8.7.0": { "type": "package", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.2", - "Microsoft.IdentityModel.Logging": "8.6.1" + "Microsoft.IdentityModel.Logging": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Tokens.dll": { @@ -717,10 +717,10 @@ "useSharedDesignerContext.txt" ] }, - "Microsoft.IdentityModel.Abstractions/8.6.1": { - "sha512": "OwmvCXYTttrxV3qT7QKDkoQP4/DB4RWjTwEqV+dNfb2opHn29WGDzoF+r4BVFQVy+BDYMhRlhIp8g3jSyJd+4Q==", + "Microsoft.IdentityModel.Abstractions/8.7.0": { + "sha512": "OQd5aVepYvh5evOmBMeAYjMIpEcTf1ZCBZaU7Nh/RlhhdXefjFDJeP1L2F2zeNT1unFr+wUu/h3Ac2Xb4BXU6w==", "type": "package", - "path": "microsoft.identitymodel.abstractions/8.6.1", + "path": "microsoft.identitymodel.abstractions/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -737,14 +737,14 @@ "lib/net9.0/Microsoft.IdentityModel.Abstractions.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Abstractions.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Abstractions.xml", - "microsoft.identitymodel.abstractions.8.6.1.nupkg.sha512", + "microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", "microsoft.identitymodel.abstractions.nuspec" ] }, - "Microsoft.IdentityModel.Logging/8.6.1": { - "sha512": "BdWlVgJYdmcR9TMUOhaZ3vJyaRO7zr7xgK+cRT4R2q59Xl7JMmTB4ctb/VOsyDhxXb497jDNNvLwldp+2ZVBEg==", + "Microsoft.IdentityModel.Logging/8.7.0": { + "sha512": "Bs0TznPAu+nxa9rAVHJ+j3CYECHJkT3tG8AyBfhFYlT5ldsDhoxFT7J+PKxJHLf+ayqWfvDZHHc4639W2FQCxA==", "type": "package", - "path": "microsoft.identitymodel.logging/8.6.1", + "path": "microsoft.identitymodel.logging/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -761,14 +761,14 @@ "lib/net9.0/Microsoft.IdentityModel.Logging.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Logging.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Logging.xml", - "microsoft.identitymodel.logging.8.6.1.nupkg.sha512", + "microsoft.identitymodel.logging.8.7.0.nupkg.sha512", "microsoft.identitymodel.logging.nuspec" ] }, - "Microsoft.IdentityModel.Tokens/8.6.1": { - "sha512": "FvED2com8LIFl9yFXneiX0uxNf9fuf8jKDFcvxC93qXOAfFa8fdLkCiur1vWF+PvgQHhsHVBe6CtDZHzsN8nCQ==", + "Microsoft.IdentityModel.Tokens/8.7.0": { + "sha512": "5Z6voXjRXAnGklhmZd1mKz89UhcF5ZQQZaZc2iKrOuL4Li1UihG2vlJx8IbiFAOIxy/xdbsAm0A+WZEaH5fxng==", "type": "package", - "path": "microsoft.identitymodel.tokens/8.6.1", + "path": "microsoft.identitymodel.tokens/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -785,7 +785,7 @@ "lib/net9.0/Microsoft.IdentityModel.Tokens.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Tokens.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Tokens.xml", - "microsoft.identitymodel.tokens.8.6.1.nupkg.sha512", + "microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", "microsoft.identitymodel.tokens.nuspec" ] }, @@ -1238,7 +1238,7 @@ "Fantasy-Net.ConfigTable >= 2024.2.0", "Fantasy-Net.Tools.ExporterConfigTable >= 2024.2.0", "Fantasy-Net.Tools.ExporterNetworkProtocol >= 2024.2.24", - "Microsoft.IdentityModel.Tokens >= 8.6.1" + "Microsoft.IdentityModel.Tokens >= 8.7.0" ] }, "packageFolders": { @@ -1248,11 +1248,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -1309,7 +1309,7 @@ }, "Microsoft.IdentityModel.Tokens": { "target": "Package", - "version": "[8.6.1, )" + "version": "[8.7.0, )" } }, "imports": [ diff --git a/GameServer/Server/APlugins/obj/project.nuget.cache b/GameServer/Server/APlugins/obj/project.nuget.cache index ee92edae..5a3ffd3a 100644 --- a/GameServer/Server/APlugins/obj/project.nuget.cache +++ b/GameServer/Server/APlugins/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "i9gy83qNQ+0=", + "dgSpecHash": "pU7iYx37aHI=", "success": true, - "projectFilePath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "expectedPackageFiles": [ "C:\\Users\\qq137\\.nuget\\packages\\commandlineparser\\2.9.1\\commandlineparser.2.9.1.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\dnsclient\\1.6.1\\dnsclient.1.6.1.nupkg.sha512", @@ -13,9 +13,9 @@ "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.tools.exporternetworkprotocol\\2024.2.24\\fantasy-net.tools.exporternetworkprotocol.2024.2.24.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.6.1\\microsoft.identitymodel.abstractions.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.logging\\8.6.1\\microsoft.identitymodel.logging.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.6.1\\microsoft.identitymodel.tokens.8.6.1.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.7.0\\microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.logging\\8.7.0\\microsoft.identitymodel.logging.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.7.0\\microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\mongodb.bson\\3.1.0\\mongodb.bson.3.1.0.nupkg.sha512", diff --git a/GameServer/Server/APlugins/obj/project.packagespec.json b/GameServer/Server/APlugins/obj/project.packagespec.json index 4ae0b00b..cb39a2ea 100644 --- a/GameServer/Server/APlugins/obj/project.packagespec.json +++ b/GameServer/Server/APlugins/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","projectName":"APlugins","projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","outputPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net.Config":{"target":"Package","version":"[2024.1.4, )"},"Fantasy-Net.ConfigTable":{"target":"Package","version":"[2024.2.0, )"},"Fantasy-Net.Tools.ExporterConfigTable":{"target":"Package","version":"[2024.2.0, )"},"Fantasy-Net.Tools.ExporterNetworkProtocol":{"target":"Package","version":"[2024.2.24, )"},"Microsoft.IdentityModel.Tokens":{"target":"Package","version":"[8.6.1, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","projectName":"APlugins","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net.Config":{"target":"Package","version":"[2024.1.4, )"},"Fantasy-Net.ConfigTable":{"target":"Package","version":"[2024.2.0, )"},"Fantasy-Net.Tools.ExporterConfigTable":{"target":"Package","version":"[2024.2.0, )"},"Fantasy-Net.Tools.ExporterNetworkProtocol":{"target":"Package","version":"[2024.2.24, )"},"Microsoft.IdentityModel.Tokens":{"target":"Package","version":"[8.7.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info index a65c1c29..2c5e225a 100644 --- a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info +++ b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17428880713941923 \ No newline at end of file +17430609177947894 \ 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 1f0657b2..1fa5b8fd 100644 --- a/GameServer/Server/APlugins/obj/rider.project.restore.info +++ b/GameServer/Server/APlugins/obj/rider.project.restore.info @@ -1 +1 @@ -17428881050117836 \ No newline at end of file +17431250882058787 \ No newline at end of file diff --git a/GameServer/Server/Entity/Entity.csproj b/GameServer/Server/Entity/Entity.csproj index cd56b39c..8530f36e 100644 --- a/GameServer/Server/Entity/Entity.csproj +++ b/GameServer/Server/Entity/Entity.csproj @@ -8,7 +8,7 @@ - + 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 914d08dd..0a3cf200 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+97396517dda7eb725da08aa889df20dc11364034")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8d9459c1734a4693b4a3984994643c336133b96f")] [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 2df06674..1670f719 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 @@ -453a3c78b512da3fe7ca1b2465c0d2654ab6e3e027800925ecba2bd15ae332b5 +17e0e52ce359b910bd47e70b4d7404614c2328a8210fad19eb3fd9c6d1177ffc diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.GeneratedMSBuildEditorConfig.editorconfig b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.GeneratedMSBuildEditorConfig.editorconfig index d6b7d98f..2abfc8ee 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.GeneratedMSBuildEditorConfig.editorconfig +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Entity -build_property.ProjectDir = D:\TecentUGit\EintooAR\GameServer\Server\Entity\ +build_property.ProjectDir = D:\UnityProject\EintooAR\GameServer\Server\Entity\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.assets.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.assets.cache index 94a3687c10b746929805051b94cc62b76455c54e..2a32c750cb7061daae4c37ddbc5bb154ca8b883b 100644 GIT binary patch delta 305 zcmbQ+%Q&}}Q6s?H-I0fZf#GUh2glKS6Sec?yT7JiQat`?b*1+D=4(OApLfe;@vX?; zsPU4O*<8j?s0~h-s&NulXTOyoaC&4kfkUas)*WUb}J(mT< z*__Xl#SUiN5sqSpE8l0&JK0){dvd9G2wd!gcsiV2CjmBU^FxWp5KZ|!I-5Vs6mq~- zfE=Zx!ZCTVY6)Bnu&S?XUQzRKs(-+WMa4i`vfbArWsRu&+` Sb+Vv={^WjrvCR>7t{eaw-)Kt! delta 305 zcmbQ+%Q&}}Q6s?H-I0fZf#JkXmpiHTlaD-pHtEwURiW&ea{sKlxiWw5Kk+9dD{hJM zMva%O%w~FqlOIZ`Ox|ZNFnJv-$K(LE7`WI6alXk9*%IOWIth-+h3pAXzV_z-?71u; z&gOicEOs#Cj&Kw+T=_nG-pSTt+>=YiL*QZ`#M9yIItj2*n;%L%hG@#?(b@c2rjP@! z0^}$i6^_Y^RZHMvAV>MARl@loM}1MNfbz9B&r<&i@l`&L{^oGpL*D}@%j}6M4U&wEAO(z!e8H8) zC8@c3L8W;mnYpQqoRbSVMPfj5^*{myKnj5*2awocA73wcmCFh&fFQWaO!N%&j17zp zEg2cP_555zob!uP9SaH=IYEkm;6D^FGB8F?-Y6`;S%lG!li5tqaB@74%H&EeG49VN zC0EAYMB$@6&(7-8!A zCNJSNLQ<05NL;pB9o?^Z9j9 z%n}oDgxak#xlTX;$;om+Crbdu*ifC_H+iC= 1.0.0", "Fantasy-Net >= 2024.2.24", - "System.IdentityModel.Tokens.Jwt >= 8.6.1", + "System.IdentityModel.Tokens.Jwt >= 8.7.0", "System.Security.Cryptography.Cng >= 5.0.0" ] }, @@ -1486,11 +1486,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "projectName": "Entity", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -1511,8 +1511,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" } } } @@ -1539,7 +1539,7 @@ }, "System.IdentityModel.Tokens.Jwt": { "target": "Package", - "version": "[8.6.1, )" + "version": "[8.7.0, )" }, "System.Security.Cryptography.Cng": { "target": "Package", diff --git a/GameServer/Server/Entity/obj/project.nuget.cache b/GameServer/Server/Entity/obj/project.nuget.cache index 75efd656..10bc24c2 100644 --- a/GameServer/Server/Entity/obj/project.nuget.cache +++ b/GameServer/Server/Entity/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "lBW8oaIHCiY=", + "dgSpecHash": "bprZeXiYGWA=", "success": true, - "projectFilePath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "expectedPackageFiles": [ "C:\\Users\\qq137\\.nuget\\packages\\commandlineparser\\2.9.1\\commandlineparser.2.9.1.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\dnsclient\\1.6.1\\dnsclient.1.6.1.nupkg.sha512", @@ -13,10 +13,10 @@ "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.tools.exporternetworkprotocol\\2024.2.24\\fantasy-net.tools.exporternetworkprotocol.2024.2.24.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.6.1\\microsoft.identitymodel.abstractions.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.6.1\\microsoft.identitymodel.jsonwebtokens.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.logging\\8.6.1\\microsoft.identitymodel.logging.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.6.1\\microsoft.identitymodel.tokens.8.6.1.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.7.0\\microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.7.0\\microsoft.identitymodel.jsonwebtokens.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.logging\\8.7.0\\microsoft.identitymodel.logging.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.7.0\\microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\mongodb.bson\\3.1.0\\mongodb.bson.3.1.0.nupkg.sha512", @@ -29,7 +29,7 @@ "C:\\Users\\qq137\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.collections.immutable\\7.0.0\\system.collections.immutable.7.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.formats.asn1\\5.0.0\\system.formats.asn1.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.6.1\\system.identitymodel.tokens.jwt.8.6.1.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.7.0\\system.identitymodel.tokens.jwt.8.7.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512", diff --git a/GameServer/Server/Entity/obj/project.packagespec.json b/GameServer/Server/Entity/obj/project.packagespec.json index 3e96fa62..cf8703d3 100644 --- a/GameServer/Server/Entity/obj/project.packagespec.json +++ b/GameServer/Server/Entity/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","projectName":"Entity","projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","outputPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net":{"target":"Package","version":"[2024.2.24, )"},"System.IdentityModel.Tokens.Jwt":{"target":"Package","version":"[8.6.1, )"},"System.Security.Cryptography.Cng":{"target":"Package","version":"[5.0.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","projectName":"Entity","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net":{"target":"Package","version":"[2024.2.24, )"},"System.IdentityModel.Tokens.Jwt":{"target":"Package","version":"[8.7.0, )"},"System.Security.Cryptography.Cng":{"target":"Package","version":"[5.0.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/rider.project.model.nuget.info b/GameServer/Server/Entity/obj/rider.project.model.nuget.info index 5c82eb88..316f79b7 100644 --- a/GameServer/Server/Entity/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Entity/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17428880714082737 \ No newline at end of file +17430609178339392 \ 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 5e78bb0e..0cf1d997 100644 --- a/GameServer/Server/Entity/obj/rider.project.restore.info +++ b/GameServer/Server/Entity/obj/rider.project.restore.info @@ -1 +1 @@ -17428881050097317 \ No newline at end of file +17431250882068788 \ No newline at end of file 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 6a10a139..d7e2ced6 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+97396517dda7eb725da08aa889df20dc11364034")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8d9459c1734a4693b4a3984994643c336133b96f")] [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 27e5c783..332a1a82 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 @@ -c994290b21adc7daa44cb0e9f46c029344d1dbf460f7bcf1c88d8d0f1e47e4ed +cf4757179d02909ff14ec2f611aeb7a8097123a753b0321837c470a220cecb66 diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.GeneratedMSBuildEditorConfig.editorconfig b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.GeneratedMSBuildEditorConfig.editorconfig index ecac3afb..6b63853a 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.GeneratedMSBuildEditorConfig.editorconfig +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Hotfix -build_property.ProjectDir = D:\TecentUGit\EintooAR\GameServer\Server\Hotfix\ +build_property.ProjectDir = D:\UnityProject\EintooAR\GameServer\Server\Hotfix\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.assets.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.assets.cache index 6ae820a062c3b4a1fd567a1df4ab630cfaee580f..7b0152fb42ae2b03d7ede9beefb12c24f58b7503 100644 GIT binary patch delta 282 zcmey`$@sOCQ6s?H-I0fZfgytNM$1EA?;bf-zJ-@XyptcWB|-W6lS|lR;c^pr*f;-Y&t(A% zJdoDeJey|=CtUWdIq&3Vv3NKiWRjS86qK(sdA@iATn=QCs>BXvkig~#(sMcBG9Wi? qQK^CRA?{(BoS|9<6-MrG=hZg{DabSJ` 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 1fddcff59ebadd410019f0168d92803b92f371e7..55d2e72041540eb6c5fda49419ead5755fefd3bd 100644 GIT binary patch delta 390 zcmccQeb_~ejZut&fq~K2#VRH=FSDdFpeR2pHF=_l3)?N0f3F#HC&txG&gT>04@6Zk zS%}4hP3Gixpo+-}EDazfjFFQY_~bWtu-b7lo9h`&J}06w`7NIqx5}Asni+RF7#SH= zCf^s30E+RjF>(McWuF`%EM zsod9Vxq39+LaBrKwXWKfrgBh&yBBL)XkIrj5|Nxmt{w2dukM$&~fkb|$Ti$-9-b7-7Eco4iXIYS(67m7|ORa4T|c delta 969 zcmX@?a>-kSjZut&fq~K6#VRHwH90k}B-A}~;&0iB#_DYLKGPROWlv0~k!0iqsbOT~ z3$83KNzK&@D$Og&%uQwFoLDF_c>^1V0#KTP5kxRBasY`9_VM+CSGlaf0w7{?8>_AX zoCj43ZA+s_6vdU7J8 zhyt2k!~GUvYt8&j;lh*k(q6*ZaI(a=W>*UYO?m+c@lRNp0 zpn5zeua#4nEWj->*^ZwJu0Nk&5J|s0*vfoyc`djjwH4qtY+j_WkP!en5!(0w diff --git a/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json b/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json index 0c68fa9d..7d5a2857 100644 --- a/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json +++ b/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": {} + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": {} }, "projects": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -68,7 +68,7 @@ }, "Microsoft.IdentityModel.Tokens": { "target": "Package", - "version": "[8.6.1, )" + "version": "[8.7.0, )" } }, "imports": [ @@ -91,14 +91,14 @@ } } }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "projectName": "Entity", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -119,8 +119,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" } } } @@ -147,7 +147,7 @@ }, "System.IdentityModel.Tokens.Jwt": { "target": "Package", - "version": "[8.6.1, )" + "version": "[8.7.0, )" }, "System.Security.Cryptography.Cng": { "target": "Package", @@ -174,14 +174,14 @@ } } }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "projectName": "Hotfix", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -202,8 +202,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" } } } diff --git a/GameServer/Server/Hotfix/obj/project.assets.json b/GameServer/Server/Hotfix/obj/project.assets.json index bf022634..3eedfca9 100644 --- a/GameServer/Server/Hotfix/obj/project.assets.json +++ b/GameServer/Server/Hotfix/obj/project.assets.json @@ -136,7 +136,7 @@ "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets": {} } }, - "Microsoft.IdentityModel.Abstractions/8.6.1": { + "Microsoft.IdentityModel.Abstractions/8.7.0": { "type": "package", "compile": { "lib/net9.0/Microsoft.IdentityModel.Abstractions.dll": { @@ -149,10 +149,10 @@ } } }, - "Microsoft.IdentityModel.JsonWebTokens/8.6.1": { + "Microsoft.IdentityModel.JsonWebTokens/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.JsonWebTokens.dll": { @@ -165,10 +165,10 @@ } } }, - "Microsoft.IdentityModel.Logging/8.6.1": { + "Microsoft.IdentityModel.Logging/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "8.6.1" + "Microsoft.IdentityModel.Abstractions": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Logging.dll": { @@ -181,11 +181,11 @@ } } }, - "Microsoft.IdentityModel.Tokens/8.6.1": { + "Microsoft.IdentityModel.Tokens/8.7.0": { "type": "package", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.2", - "Microsoft.IdentityModel.Logging": "8.6.1" + "Microsoft.IdentityModel.Logging": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Tokens.dll": { @@ -374,11 +374,11 @@ } } }, - "System.IdentityModel.Tokens.Jwt/8.6.1": { + "System.IdentityModel.Tokens.Jwt/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "8.6.1", - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.JsonWebTokens": "8.7.0", + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "lib/net9.0/System.IdentityModel.Tokens.Jwt.dll": { @@ -498,7 +498,7 @@ "Fantasy-Net.ConfigTable": "2024.2.0", "Fantasy-Net.Tools.ExporterConfigTable": "2024.2.0", "Fantasy-Net.Tools.ExporterNetworkProtocol": "2024.2.24", - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "bin/placeholder/APlugins.dll": {} @@ -513,7 +513,7 @@ "dependencies": { "APlugins": "1.0.0", "Fantasy-Net": "2024.2.24", - "System.IdentityModel.Tokens.Jwt": "8.6.1", + "System.IdentityModel.Tokens.Jwt": "8.7.0", "System.Security.Cryptography.Cng": "5.0.0" }, "compile": { @@ -818,10 +818,10 @@ "useSharedDesignerContext.txt" ] }, - "Microsoft.IdentityModel.Abstractions/8.6.1": { - "sha512": "OwmvCXYTttrxV3qT7QKDkoQP4/DB4RWjTwEqV+dNfb2opHn29WGDzoF+r4BVFQVy+BDYMhRlhIp8g3jSyJd+4Q==", + "Microsoft.IdentityModel.Abstractions/8.7.0": { + "sha512": "OQd5aVepYvh5evOmBMeAYjMIpEcTf1ZCBZaU7Nh/RlhhdXefjFDJeP1L2F2zeNT1unFr+wUu/h3Ac2Xb4BXU6w==", "type": "package", - "path": "microsoft.identitymodel.abstractions/8.6.1", + "path": "microsoft.identitymodel.abstractions/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -838,14 +838,14 @@ "lib/net9.0/Microsoft.IdentityModel.Abstractions.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Abstractions.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Abstractions.xml", - "microsoft.identitymodel.abstractions.8.6.1.nupkg.sha512", + "microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", "microsoft.identitymodel.abstractions.nuspec" ] }, - "Microsoft.IdentityModel.JsonWebTokens/8.6.1": { - "sha512": "CAu9DWsPZVtnyE3bOJ83rlPWpahY37sP/0bIOdRlxS90W88zSI4V3FyoCDlXxV8+gloT+a247pwPXfSNjYyAxw==", + "Microsoft.IdentityModel.JsonWebTokens/8.7.0": { + "sha512": "uzsSAWhNhbrkWbQKBTE8QhzviU6sr3bJ1Bkv7gERlhswfSKOp7HsxTRLTPBpx/whQ/GRRHEwMg8leRIPbMrOgw==", "type": "package", - "path": "microsoft.identitymodel.jsonwebtokens/8.6.1", + "path": "microsoft.identitymodel.jsonwebtokens/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -862,14 +862,14 @@ "lib/net9.0/Microsoft.IdentityModel.JsonWebTokens.xml", "lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll", "lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.xml", - "microsoft.identitymodel.jsonwebtokens.8.6.1.nupkg.sha512", + "microsoft.identitymodel.jsonwebtokens.8.7.0.nupkg.sha512", "microsoft.identitymodel.jsonwebtokens.nuspec" ] }, - "Microsoft.IdentityModel.Logging/8.6.1": { - "sha512": "BdWlVgJYdmcR9TMUOhaZ3vJyaRO7zr7xgK+cRT4R2q59Xl7JMmTB4ctb/VOsyDhxXb497jDNNvLwldp+2ZVBEg==", + "Microsoft.IdentityModel.Logging/8.7.0": { + "sha512": "Bs0TznPAu+nxa9rAVHJ+j3CYECHJkT3tG8AyBfhFYlT5ldsDhoxFT7J+PKxJHLf+ayqWfvDZHHc4639W2FQCxA==", "type": "package", - "path": "microsoft.identitymodel.logging/8.6.1", + "path": "microsoft.identitymodel.logging/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -886,14 +886,14 @@ "lib/net9.0/Microsoft.IdentityModel.Logging.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Logging.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Logging.xml", - "microsoft.identitymodel.logging.8.6.1.nupkg.sha512", + "microsoft.identitymodel.logging.8.7.0.nupkg.sha512", "microsoft.identitymodel.logging.nuspec" ] }, - "Microsoft.IdentityModel.Tokens/8.6.1": { - "sha512": "FvED2com8LIFl9yFXneiX0uxNf9fuf8jKDFcvxC93qXOAfFa8fdLkCiur1vWF+PvgQHhsHVBe6CtDZHzsN8nCQ==", + "Microsoft.IdentityModel.Tokens/8.7.0": { + "sha512": "5Z6voXjRXAnGklhmZd1mKz89UhcF5ZQQZaZc2iKrOuL4Li1UihG2vlJx8IbiFAOIxy/xdbsAm0A+WZEaH5fxng==", "type": "package", - "path": "microsoft.identitymodel.tokens/8.6.1", + "path": "microsoft.identitymodel.tokens/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -910,7 +910,7 @@ "lib/net9.0/Microsoft.IdentityModel.Tokens.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Tokens.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Tokens.xml", - "microsoft.identitymodel.tokens.8.6.1.nupkg.sha512", + "microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", "microsoft.identitymodel.tokens.nuspec" ] }, @@ -1201,10 +1201,10 @@ "version.txt" ] }, - "System.IdentityModel.Tokens.Jwt/8.6.1": { - "sha512": "EXL1Tj+pizswtHHPiQyNumrTo8XOLX7SoTm7Bz00/DyiIoG2H/kQItoajSvr1MYtvDNXveqULsoWDoJFI3aHzQ==", + "System.IdentityModel.Tokens.Jwt/8.7.0": { + "sha512": "8dKL3A9pVqYCJIXHd4H2epQqLxSvKeNxGonR0e5g89yMchyvsM/NLuB06otx29BicUd6+LUJZgNZmvYjjPsPGg==", "type": "package", - "path": "system.identitymodel.tokens.jwt/8.6.1", + "path": "system.identitymodel.tokens.jwt/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1221,7 +1221,7 @@ "lib/net9.0/System.IdentityModel.Tokens.Jwt.xml", "lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.dll", "lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.xml", - "system.identitymodel.tokens.jwt.8.6.1.nupkg.sha512", + "system.identitymodel.tokens.jwt.8.7.0.nupkg.sha512", "system.identitymodel.tokens.jwt.nuspec" ] }, @@ -1504,11 +1504,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "projectName": "Hotfix", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -1529,8 +1529,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" } } } diff --git a/GameServer/Server/Hotfix/obj/project.nuget.cache b/GameServer/Server/Hotfix/obj/project.nuget.cache index 4c3dbb49..3f605057 100644 --- a/GameServer/Server/Hotfix/obj/project.nuget.cache +++ b/GameServer/Server/Hotfix/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "RkgJgHWZlRw=", + "dgSpecHash": "5ISyAvbrzVY=", "success": true, - "projectFilePath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "expectedPackageFiles": [ "C:\\Users\\qq137\\.nuget\\packages\\commandlineparser\\2.9.1\\commandlineparser.2.9.1.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\dnsclient\\1.6.1\\dnsclient.1.6.1.nupkg.sha512", @@ -13,10 +13,10 @@ "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.tools.exporternetworkprotocol\\2024.2.24\\fantasy-net.tools.exporternetworkprotocol.2024.2.24.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.6.1\\microsoft.identitymodel.abstractions.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.6.1\\microsoft.identitymodel.jsonwebtokens.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.logging\\8.6.1\\microsoft.identitymodel.logging.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.6.1\\microsoft.identitymodel.tokens.8.6.1.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.7.0\\microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.7.0\\microsoft.identitymodel.jsonwebtokens.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.logging\\8.7.0\\microsoft.identitymodel.logging.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.7.0\\microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\mongodb.bson\\3.1.0\\mongodb.bson.3.1.0.nupkg.sha512", @@ -29,7 +29,7 @@ "C:\\Users\\qq137\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.collections.immutable\\7.0.0\\system.collections.immutable.7.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.formats.asn1\\5.0.0\\system.formats.asn1.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.6.1\\system.identitymodel.tokens.jwt.8.6.1.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.7.0\\system.identitymodel.tokens.jwt.8.7.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512", diff --git a/GameServer/Server/Hotfix/obj/project.packagespec.json b/GameServer/Server/Hotfix/obj/project.packagespec.json index f5ec5fcc..26e41894 100644 --- a/GameServer/Server/Hotfix/obj/project.packagespec.json +++ b/GameServer/Server/Hotfix/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","projectName":"Hotfix","projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","outputPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","projectName":"Hotfix","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info index de8d3f88..6655095d 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17428880714209637 \ No newline at end of file +17430609178771257 \ 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 7d3f574e..0cf1d997 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.restore.info +++ b/GameServer/Server/Hotfix/obj/rider.project.restore.info @@ -1 +1 @@ -17428881050112620 \ No newline at end of file +17431250882068788 \ 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 fde5855f..8f8e6ce8 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+97396517dda7eb725da08aa889df20dc11364034")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8d9459c1734a4693b4a3984994643c336133b96f")] [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 ee06f517..b2d3b703 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 @@ -c867e87d8ec00a6b7bf144ceb626500979e18cf22feba24e0ac0c2db1c2f0d78 +8fd0cdd4e19f420920625e3fbfb58bf898fed79ca5c33526410f9d8f40f6bc6f diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.GeneratedMSBuildEditorConfig.editorconfig b/GameServer/Server/Main/obj/Debug/net9.0/Main.GeneratedMSBuildEditorConfig.editorconfig index c80a1109..33f083a6 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.GeneratedMSBuildEditorConfig.editorconfig +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Main -build_property.ProjectDir = D:\TecentUGit\EintooAR\GameServer\Server\Main\ +build_property.ProjectDir = D:\UnityProject\EintooAR\GameServer\Server\Main\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.assets.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.assets.cache index bb8502eec0650a90effdd10dcac33de3d1702452..3c89e778ab89358a15664301d5585b3c09047aea 100644 GIT binary patch delta 275 zcmX>0hiz~!!FRWzS zs1eV`Y_4Z8d4q(?Y^Q*<^jmi^BGmtDsuF!`oh4V({hORstv sl&>?{NTUKSm&d`i`L;$5*b|$*^x3#sfW9%F9B8c!bd12}cB>P-08@BaApigX delta 275 zcmX>R7ayAy*kGCSfXQvnMMfyp=3YT$g3TYA;Y tpnRRlMj91xxjYW8&9^mjz@FIbrO(FA0`!gXpko9!w_Bay1ppw2Sr7mK 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 a85e47eca12b65a365fd6066e46625a41d6b9d48..4c5a9762d0e2ea32a83deec624e989cee080adb1 100644 GIT binary patch delta 412 zcmeB-+UG6C#wf|az`z*jVigmbmswI7P?VpQnmoCjQFfxCwusEh@2?qi?{Y9QGIBTu z>bW3~erKw^;rG^-MmTHQlEN_6y_OpVO zO)e8q*sRIr%*AZ3XE3=zLS^z95uVBOMYvd1&V19%n7mFzpOJmCqnz7h1M$Aen?wy6 z%_kemt4;nZtuk3p%mc1#u9!Ht>H3$N8DKZ7PCg(ZF?p^SFB>BV(3da+4j^f^mT-b< zHf05CoV-gy3(2aTk~&DL4Wu05R`F`FPo6Ku$qshlU5?2L9O_8=R!eI`^lknty@MC5 fX@{mM`?Kv#T0pl=Zs5>BQv6X1$&$?(+6x&0^p=9p delta 1669 zcmdnz-5Djq#wf|az`*G5VigmTnw*+f66&5g`30lwL}P6>hrS0+me~_i8YCGRL5dg| z`GPBpOHy<7f=csBGILWIIVU%=%On8h7(fbuBnOb#U>{#Ec$LcvEPx=m%1rbO^o$LR z4J{cNx%K>9L!9%AQXLBl7&$?TfZ#tAFfuTDqq}Fa0;4*cz0dRoQQ4Dy8EYiLnsB*D z0c09J7fsG)(=|X+1Y&{!SP#%tA*er{^K)`ilS?x5^NJyURe`I*|}20-8R<{T5+s&HPN^!jo4jX|TeTTf@a6)?g?Hx=|E0F7$lz6H`))AkIX$ z4kJn?cgU(up1{tFu28i)@J6kkZ#vxm$@LtT5^x?gP=S1KNKG~rRh;a@!<&Gl0F(lz z%+w0zcX_M`7lwo@MJd2VXwGfsg;CjeIe>m=^T;nr%dD9EkV|iJ4wI84BR9}0ic$k^ zKl(Fjkd;(y;l9V6RK%fi=#!aOsOMTyP?TC+j7V%wM3^80H6b`PxwI&=q*BkhsIs6W zKfNfiAfuA5Y1RTxgCoA;JJyvE>ZR$N4$X zVk?B8Mz8{s5^dyULoWHv_n4fyn9cMIC+qR6Om5)g5!Fk{$pIIk44+R*u8ajIVU@{_ zf)XHE4n4%{k}_w(gI4YFpvvR{5>?BqOt186Y;Qd=xwgrrtw@&^GY zxW&DK?2{7&xuE*;1+|d$Q4t7Hnb Tb-5C{AY~3uYvXBt~nj=hj diff --git a/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json b/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json index 7cf352f8..537365f0 100644 --- a/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json +++ b/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj": {} + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj": {} }, "projects": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -68,7 +68,7 @@ }, "Microsoft.IdentityModel.Tokens": { "target": "Package", - "version": "[8.6.1, )" + "version": "[8.7.0, )" } }, "imports": [ @@ -91,14 +91,14 @@ } } }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "projectName": "Entity", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -119,8 +119,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" } } } @@ -147,7 +147,7 @@ }, "System.IdentityModel.Tokens.Jwt": { "target": "Package", - "version": "[8.6.1, )" + "version": "[8.7.0, )" }, "System.Security.Cryptography.Cng": { "target": "Package", @@ -174,14 +174,14 @@ } } }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "projectName": "Hotfix", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -202,8 +202,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" } } } @@ -243,14 +243,14 @@ } } }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj": { + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", "projectName": "Main", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -271,14 +271,14 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj" } } } diff --git a/GameServer/Server/Main/obj/project.assets.json b/GameServer/Server/Main/obj/project.assets.json index ecea10b4..8881d205 100644 --- a/GameServer/Server/Main/obj/project.assets.json +++ b/GameServer/Server/Main/obj/project.assets.json @@ -152,7 +152,7 @@ "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets": {} } }, - "Microsoft.IdentityModel.Abstractions/8.6.1": { + "Microsoft.IdentityModel.Abstractions/8.7.0": { "type": "package", "compile": { "lib/net9.0/Microsoft.IdentityModel.Abstractions.dll": { @@ -165,10 +165,10 @@ } } }, - "Microsoft.IdentityModel.JsonWebTokens/8.6.1": { + "Microsoft.IdentityModel.JsonWebTokens/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.JsonWebTokens.dll": { @@ -181,10 +181,10 @@ } } }, - "Microsoft.IdentityModel.Logging/8.6.1": { + "Microsoft.IdentityModel.Logging/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "8.6.1" + "Microsoft.IdentityModel.Abstractions": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Logging.dll": { @@ -197,11 +197,11 @@ } } }, - "Microsoft.IdentityModel.Tokens/8.6.1": { + "Microsoft.IdentityModel.Tokens/8.7.0": { "type": "package", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.2", - "Microsoft.IdentityModel.Logging": "8.6.1" + "Microsoft.IdentityModel.Logging": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Tokens.dll": { @@ -403,11 +403,11 @@ } } }, - "System.IdentityModel.Tokens.Jwt/8.6.1": { + "System.IdentityModel.Tokens.Jwt/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "8.6.1", - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.JsonWebTokens": "8.7.0", + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "lib/net9.0/System.IdentityModel.Tokens.Jwt.dll": { @@ -527,7 +527,7 @@ "Fantasy-Net.ConfigTable": "2024.2.0", "Fantasy-Net.Tools.ExporterConfigTable": "2024.2.0", "Fantasy-Net.Tools.ExporterNetworkProtocol": "2024.2.24", - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "bin/placeholder/APlugins.dll": {} @@ -542,7 +542,7 @@ "dependencies": { "APlugins": "1.0.0", "Fantasy-Net": "2024.2.24", - "System.IdentityModel.Tokens.Jwt": "8.6.1", + "System.IdentityModel.Tokens.Jwt": "8.7.0", "System.Security.Cryptography.Cng": "5.0.0" }, "compile": { @@ -717,7 +717,7 @@ "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets": {} } }, - "Microsoft.IdentityModel.Abstractions/8.6.1": { + "Microsoft.IdentityModel.Abstractions/8.7.0": { "type": "package", "compile": { "lib/net9.0/Microsoft.IdentityModel.Abstractions.dll": { @@ -730,10 +730,10 @@ } } }, - "Microsoft.IdentityModel.JsonWebTokens/8.6.1": { + "Microsoft.IdentityModel.JsonWebTokens/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.JsonWebTokens.dll": { @@ -746,10 +746,10 @@ } } }, - "Microsoft.IdentityModel.Logging/8.6.1": { + "Microsoft.IdentityModel.Logging/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "8.6.1" + "Microsoft.IdentityModel.Abstractions": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Logging.dll": { @@ -762,11 +762,11 @@ } } }, - "Microsoft.IdentityModel.Tokens/8.6.1": { + "Microsoft.IdentityModel.Tokens/8.7.0": { "type": "package", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.2", - "Microsoft.IdentityModel.Logging": "8.6.1" + "Microsoft.IdentityModel.Logging": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Tokens.dll": { @@ -962,11 +962,11 @@ } } }, - "System.IdentityModel.Tokens.Jwt/8.6.1": { + "System.IdentityModel.Tokens.Jwt/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "8.6.1", - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.JsonWebTokens": "8.7.0", + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "lib/net9.0/System.IdentityModel.Tokens.Jwt.dll": { @@ -1064,7 +1064,7 @@ "Fantasy-Net.ConfigTable": "2024.2.0", "Fantasy-Net.Tools.ExporterConfigTable": "2024.2.0", "Fantasy-Net.Tools.ExporterNetworkProtocol": "2024.2.24", - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "bin/placeholder/APlugins.dll": {} @@ -1079,7 +1079,7 @@ "dependencies": { "APlugins": "1.0.0", "Fantasy-Net": "2024.2.24", - "System.IdentityModel.Tokens.Jwt": "8.6.1", + "System.IdentityModel.Tokens.Jwt": "8.7.0", "System.Security.Cryptography.Cng": "5.0.0" }, "compile": { @@ -1254,7 +1254,7 @@ "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets": {} } }, - "Microsoft.IdentityModel.Abstractions/8.6.1": { + "Microsoft.IdentityModel.Abstractions/8.7.0": { "type": "package", "compile": { "lib/net9.0/Microsoft.IdentityModel.Abstractions.dll": { @@ -1267,10 +1267,10 @@ } } }, - "Microsoft.IdentityModel.JsonWebTokens/8.6.1": { + "Microsoft.IdentityModel.JsonWebTokens/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.JsonWebTokens.dll": { @@ -1283,10 +1283,10 @@ } } }, - "Microsoft.IdentityModel.Logging/8.6.1": { + "Microsoft.IdentityModel.Logging/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "8.6.1" + "Microsoft.IdentityModel.Abstractions": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Logging.dll": { @@ -1299,11 +1299,11 @@ } } }, - "Microsoft.IdentityModel.Tokens/8.6.1": { + "Microsoft.IdentityModel.Tokens/8.7.0": { "type": "package", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.2", - "Microsoft.IdentityModel.Logging": "8.6.1" + "Microsoft.IdentityModel.Logging": "8.7.0" }, "compile": { "lib/net9.0/Microsoft.IdentityModel.Tokens.dll": { @@ -1499,11 +1499,11 @@ } } }, - "System.IdentityModel.Tokens.Jwt/8.6.1": { + "System.IdentityModel.Tokens.Jwt/8.7.0": { "type": "package", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "8.6.1", - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.JsonWebTokens": "8.7.0", + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "lib/net9.0/System.IdentityModel.Tokens.Jwt.dll": { @@ -1601,7 +1601,7 @@ "Fantasy-Net.ConfigTable": "2024.2.0", "Fantasy-Net.Tools.ExporterConfigTable": "2024.2.0", "Fantasy-Net.Tools.ExporterNetworkProtocol": "2024.2.24", - "Microsoft.IdentityModel.Tokens": "8.6.1" + "Microsoft.IdentityModel.Tokens": "8.7.0" }, "compile": { "bin/placeholder/APlugins.dll": {} @@ -1616,7 +1616,7 @@ "dependencies": { "APlugins": "1.0.0", "Fantasy-Net": "2024.2.24", - "System.IdentityModel.Tokens.Jwt": "8.6.1", + "System.IdentityModel.Tokens.Jwt": "8.7.0", "System.Security.Cryptography.Cng": "5.0.0" }, "compile": { @@ -1950,10 +1950,10 @@ "useSharedDesignerContext.txt" ] }, - "Microsoft.IdentityModel.Abstractions/8.6.1": { - "sha512": "OwmvCXYTttrxV3qT7QKDkoQP4/DB4RWjTwEqV+dNfb2opHn29WGDzoF+r4BVFQVy+BDYMhRlhIp8g3jSyJd+4Q==", + "Microsoft.IdentityModel.Abstractions/8.7.0": { + "sha512": "OQd5aVepYvh5evOmBMeAYjMIpEcTf1ZCBZaU7Nh/RlhhdXefjFDJeP1L2F2zeNT1unFr+wUu/h3Ac2Xb4BXU6w==", "type": "package", - "path": "microsoft.identitymodel.abstractions/8.6.1", + "path": "microsoft.identitymodel.abstractions/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1970,14 +1970,14 @@ "lib/net9.0/Microsoft.IdentityModel.Abstractions.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Abstractions.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Abstractions.xml", - "microsoft.identitymodel.abstractions.8.6.1.nupkg.sha512", + "microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", "microsoft.identitymodel.abstractions.nuspec" ] }, - "Microsoft.IdentityModel.JsonWebTokens/8.6.1": { - "sha512": "CAu9DWsPZVtnyE3bOJ83rlPWpahY37sP/0bIOdRlxS90W88zSI4V3FyoCDlXxV8+gloT+a247pwPXfSNjYyAxw==", + "Microsoft.IdentityModel.JsonWebTokens/8.7.0": { + "sha512": "uzsSAWhNhbrkWbQKBTE8QhzviU6sr3bJ1Bkv7gERlhswfSKOp7HsxTRLTPBpx/whQ/GRRHEwMg8leRIPbMrOgw==", "type": "package", - "path": "microsoft.identitymodel.jsonwebtokens/8.6.1", + "path": "microsoft.identitymodel.jsonwebtokens/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1994,14 +1994,14 @@ "lib/net9.0/Microsoft.IdentityModel.JsonWebTokens.xml", "lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll", "lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.xml", - "microsoft.identitymodel.jsonwebtokens.8.6.1.nupkg.sha512", + "microsoft.identitymodel.jsonwebtokens.8.7.0.nupkg.sha512", "microsoft.identitymodel.jsonwebtokens.nuspec" ] }, - "Microsoft.IdentityModel.Logging/8.6.1": { - "sha512": "BdWlVgJYdmcR9TMUOhaZ3vJyaRO7zr7xgK+cRT4R2q59Xl7JMmTB4ctb/VOsyDhxXb497jDNNvLwldp+2ZVBEg==", + "Microsoft.IdentityModel.Logging/8.7.0": { + "sha512": "Bs0TznPAu+nxa9rAVHJ+j3CYECHJkT3tG8AyBfhFYlT5ldsDhoxFT7J+PKxJHLf+ayqWfvDZHHc4639W2FQCxA==", "type": "package", - "path": "microsoft.identitymodel.logging/8.6.1", + "path": "microsoft.identitymodel.logging/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -2018,14 +2018,14 @@ "lib/net9.0/Microsoft.IdentityModel.Logging.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Logging.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Logging.xml", - "microsoft.identitymodel.logging.8.6.1.nupkg.sha512", + "microsoft.identitymodel.logging.8.7.0.nupkg.sha512", "microsoft.identitymodel.logging.nuspec" ] }, - "Microsoft.IdentityModel.Tokens/8.6.1": { - "sha512": "FvED2com8LIFl9yFXneiX0uxNf9fuf8jKDFcvxC93qXOAfFa8fdLkCiur1vWF+PvgQHhsHVBe6CtDZHzsN8nCQ==", + "Microsoft.IdentityModel.Tokens/8.7.0": { + "sha512": "5Z6voXjRXAnGklhmZd1mKz89UhcF5ZQQZaZc2iKrOuL4Li1UihG2vlJx8IbiFAOIxy/xdbsAm0A+WZEaH5fxng==", "type": "package", - "path": "microsoft.identitymodel.tokens/8.6.1", + "path": "microsoft.identitymodel.tokens/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -2042,7 +2042,7 @@ "lib/net9.0/Microsoft.IdentityModel.Tokens.xml", "lib/netstandard2.0/Microsoft.IdentityModel.Tokens.dll", "lib/netstandard2.0/Microsoft.IdentityModel.Tokens.xml", - "microsoft.identitymodel.tokens.8.6.1.nupkg.sha512", + "microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", "microsoft.identitymodel.tokens.nuspec" ] }, @@ -2357,10 +2357,10 @@ "version.txt" ] }, - "System.IdentityModel.Tokens.Jwt/8.6.1": { - "sha512": "EXL1Tj+pizswtHHPiQyNumrTo8XOLX7SoTm7Bz00/DyiIoG2H/kQItoajSvr1MYtvDNXveqULsoWDoJFI3aHzQ==", + "System.IdentityModel.Tokens.Jwt/8.7.0": { + "sha512": "8dKL3A9pVqYCJIXHd4H2epQqLxSvKeNxGonR0e5g89yMchyvsM/NLuB06otx29BicUd6+LUJZgNZmvYjjPsPGg==", "type": "package", - "path": "system.identitymodel.tokens.jwt/8.6.1", + "path": "system.identitymodel.tokens.jwt/8.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -2377,7 +2377,7 @@ "lib/net9.0/System.IdentityModel.Tokens.Jwt.xml", "lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.dll", "lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.xml", - "system.identitymodel.tokens.jwt.8.6.1.nupkg.sha512", + "system.identitymodel.tokens.jwt.8.7.0.nupkg.sha512", "system.identitymodel.tokens.jwt.nuspec" ] }, @@ -2668,11 +2668,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", "projectName": "Main", - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\obj\\", + "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -2693,14 +2693,14 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" }, - "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { - "projectPath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj" + "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { + "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj" } } } diff --git a/GameServer/Server/Main/obj/project.nuget.cache b/GameServer/Server/Main/obj/project.nuget.cache index 354a6215..a2296524 100644 --- a/GameServer/Server/Main/obj/project.nuget.cache +++ b/GameServer/Server/Main/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "olRfCuItDo0=", + "dgSpecHash": "fAxunScTqKI=", "success": true, - "projectFilePath": "D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", "expectedPackageFiles": [ "C:\\Users\\qq137\\.nuget\\packages\\commandlineparser\\2.9.1\\commandlineparser.2.9.1.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\dnsclient\\1.6.1\\dnsclient.1.6.1.nupkg.sha512", @@ -14,10 +14,10 @@ "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.tools.exporternetworkprotocol\\2024.2.24\\fantasy-net.tools.exporternetworkprotocol.2024.2.24.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.6.1\\microsoft.identitymodel.abstractions.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.6.1\\microsoft.identitymodel.jsonwebtokens.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.logging\\8.6.1\\microsoft.identitymodel.logging.8.6.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.6.1\\microsoft.identitymodel.tokens.8.6.1.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.7.0\\microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.7.0\\microsoft.identitymodel.jsonwebtokens.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.logging\\8.7.0\\microsoft.identitymodel.logging.8.7.0.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.7.0\\microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\mongodb.bson\\3.1.0\\mongodb.bson.3.1.0.nupkg.sha512", @@ -31,7 +31,7 @@ "C:\\Users\\qq137\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.collections.immutable\\7.0.0\\system.collections.immutable.7.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.formats.asn1\\5.0.0\\system.formats.asn1.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.6.1\\system.identitymodel.tokens.jwt.8.6.1.nupkg.sha512", + "C:\\Users\\qq137\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.7.0\\system.identitymodel.tokens.jwt.8.7.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512", "C:\\Users\\qq137\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512", diff --git a/GameServer/Server/Main/obj/project.packagespec.json b/GameServer/Server/Main/obj/project.packagespec.json index 3113a467..0a14f658 100644 --- a/GameServer/Server/Main/obj/project.packagespec.json +++ b/GameServer/Server/Main/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","projectName":"Main","projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","outputPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Main\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"},"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"},"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj":{"projectPath":"D:\\TecentUGit\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net.NLog":{"target":"Package","version":"[2024.1.20, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Runtime.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.AspNetCore.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Host.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Runtime.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.WindowsDesktop.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}}"runtimes":{"linux-x64":{"#import":[]},"win-x64":{"#import":[]}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","projectName":"Main","projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","outputPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"},"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"},"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj":{"projectPath":"D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Fantasy-Net.NLog":{"target":"Package","version":"[2024.1.20, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Runtime.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.AspNetCore.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Host.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Runtime.linux-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.NETCore.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"},{"name":"Microsoft.WindowsDesktop.App.Runtime.win-x64","version":"[9.0.3, 9.0.3]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json"}}"runtimes":{"linux-x64":{"#import":[]},"win-x64":{"#import":[]}} \ No newline at end of file diff --git a/GameServer/Server/Main/obj/rider.project.model.nuget.info b/GameServer/Server/Main/obj/rider.project.model.nuget.info index 3d2174c3..b2912f13 100644 --- a/GameServer/Server/Main/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Main/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17428880714336891 \ No newline at end of file +17430609179593162 \ 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 e969752f..0cf1d997 100644 --- a/GameServer/Server/Main/obj/rider.project.restore.info +++ b/GameServer/Server/Main/obj/rider.project.restore.info @@ -1 +1 @@ -17428885097419320 \ No newline at end of file +17431250882068788 \ No newline at end of file