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/AssetArt/Atlas/UIRaw_Atlas_YL_004_02.spriteatlas b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_02.spriteatlas index 02c4c8ff..e6f44022 100644 --- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_02.spriteatlas +++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_02.spriteatlas @@ -76,10 +76,16 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - ebbf2e87fa1b307438c0cfbdceb48026: 21300000 + - 108763afa2f42e74c94a53bba164d00f: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: ebbf2e87fa1b307438c0cfbdceb48026, type: 3} + - {fileID: 21300000, guid: 108763afa2f42e74c94a53bba164d00f, type: 3} + m_PackedSpriteNamesToIndex: + - AddtionPetBackground_2x + - AddtionPetBackground m_RenderDataMap: {} m_Tag: UIRaw_Atlas_YL_004_02 m_IsVariant: 0 diff --git a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_Delete.spriteatlas b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_Delete.spriteatlas index b1e80d52..da07d9d4 100644 --- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_Delete.spriteatlas +++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_Delete.spriteatlas @@ -76,10 +76,16 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - f19fd8c255683d5448967cb9e37f4e96: 21300000 + - 4d0e2d1c6e4fd4e4aab3c6b7d3f70b10: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: f19fd8c255683d5448967cb9e37f4e96, type: 3} + - {fileID: 21300000, guid: 4d0e2d1c6e4fd4e4aab3c6b7d3f70b10, type: 3} + m_PackedSpriteNamesToIndex: + - Delete + - Delete_2x m_RenderDataMap: {} m_Tag: UIRaw_Atlas_YL_004_Delete m_IsVariant: 0 diff --git a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition.spriteatlas b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition.spriteatlas index 44f9b949..43348ae7 100644 --- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition.spriteatlas +++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition.spriteatlas @@ -75,10 +75,13 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - ebff31ebf3689d94c975d7d9521d6905: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: ebff31ebf3689d94c975d7d9521d6905, type: 3} + m_PackedSpriteNamesToIndex: + - ARPetRecognition m_RenderDataMap: {} m_Tag: UIRaw_Atlas_YL_PetRecognition m_IsVariant: 0 diff --git a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition_SelectUI.spriteatlas b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition_SelectUI.spriteatlas index a60c8076..19043c22 100644 --- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition_SelectUI.spriteatlas +++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition_SelectUI.spriteatlas @@ -76,10 +76,16 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - b12702142ab711744a4b0c7748a590eb: 21300000 + - 49c33ff5fed24bf4295021e1a3636be4: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: b12702142ab711744a4b0c7748a590eb, type: 3} + - {fileID: 21300000, guid: 49c33ff5fed24bf4295021e1a3636be4, type: 3} + m_PackedSpriteNamesToIndex: + - Select_2x + - Select_Normal m_RenderDataMap: {} m_Tag: UIRaw_Atlas_YL_PetRecognition_SelectUI m_IsVariant: 0 diff --git a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Pet.spriteatlas b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Pet.spriteatlas index 7f458d3e..3c05fd83 100644 --- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Pet.spriteatlas +++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Pet.spriteatlas @@ -76,10 +76,16 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - 0b2576f1ecd86934fa8da25d254660ee: 21300000 + - d524938ec52b56c45a122fe40135b35c: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: 0b2576f1ecd86934fa8da25d254660ee, type: 3} + - {fileID: 21300000, guid: d524938ec52b56c45a122fe40135b35c, type: 3} + m_PackedSpriteNamesToIndex: + - "\u8D5B\u535A\u5BA0\u7269" + - "\u8D5B\u535A\u5BA0\u7269@2x" m_RenderDataMap: {} m_Tag: UIRaw_Atlas_YL_Preview_Pet m_IsVariant: 0 diff --git a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Phone.spriteatlas b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Phone.spriteatlas index b27dc58c..51289fcb 100644 --- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Phone.spriteatlas +++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Phone.spriteatlas @@ -76,10 +76,16 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - 629eb45973eded04d9cf44bd316ae59c: 21300000 + - 1cd50c894a72fb545beb7e107e67d60f: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: 629eb45973eded04d9cf44bd316ae59c, type: 3} + - {fileID: 21300000, guid: 1cd50c894a72fb545beb7e107e67d60f, type: 3} + m_PackedSpriteNamesToIndex: + - "\u624B\u673A@2x" + - "\u624B\u673A" m_RenderDataMap: {} m_Tag: UIRaw_Atlas_YL_Preview_Phone m_IsVariant: 0 diff --git a/EintooAR/Assets/AssetRaw/Actor/AR/Commom/UIWorldVideoActor.prefab b/EintooAR/Assets/AssetRaw/Actor/AR/Commom/UIWorldVideoActor.prefab index 82c329c7..aae172d0 100644 --- a/EintooAR/Assets/AssetRaw/Actor/AR/Commom/UIWorldVideoActor.prefab +++ b/EintooAR/Assets/AssetRaw/Actor/AR/Commom/UIWorldVideoActor.prefab @@ -85,7 +85,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &2456285806372326511 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes index c0064a59..4ea501c4 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes index d9949950..becccff5 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes index b5801d0a..149b77cc 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/System.Core.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/System.Core.dll.bytes index b35a4b16..13144695 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/System.Core.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/System.Core.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/System.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/System.dll.bytes index 7697ba34..6590a479 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/System.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/System.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes index 772885cc..8c100722 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/UniTask.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/UniTask.dll.bytes index d8990845..5ef8cb98 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/UniTask.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/UniTask.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes index 844e0797..cede3666 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/YooAsset.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/YooAsset.dll.bytes index 235ad6ab..407a3add 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/YooAsset.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/YooAsset.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes index b55eff22..4e56822b 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL.meta deleted file mode 100644 index 27682cf8..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d4b808144571e234fa608429814452ce -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004.meta deleted file mode 100644 index 07cffc9d..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 704f5a987f581f34e8ea8ee9b9f4c2ea -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02.meta deleted file mode 100644 index 79f118c4..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a0cac11c8523cb04d90da3b5d7eec002 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground.png deleted file mode 100644 index 1fc09fec..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground.png.meta deleted file mode 100644 index 59ba4409..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: 108763afa2f42e74c94a53bba164d00f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground_2x.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground_2x.png deleted file mode 100644 index 757133d0..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground_2x.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground_2x.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground_2x.png.meta deleted file mode 100644 index dcb3555c..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/02/AddtionPetBackground_2x.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: ebbf2e87fa1b307438c0cfbdceb48026 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/ARPetInfo.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/ARPetInfo.png deleted file mode 100644 index 8d55c993..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/ARPetInfo.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/ARPetInfo.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/ARPetInfo.png.meta deleted file mode 100644 index cd053e89..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/ARPetInfo.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: ca408073910d4304da1d2a951eaa348c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete.meta deleted file mode 100644 index 5a956c5d..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dba53f7a61ebb874f83d0ab1eab8c767 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete.png deleted file mode 100644 index 737056c1..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete.png.meta deleted file mode 100644 index c5d573d5..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: f19fd8c255683d5448967cb9e37f4e96 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete_2x.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete_2x.png deleted file mode 100644 index 1268687a..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete_2x.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete_2x.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete_2x.png.meta deleted file mode 100644 index 0d7b9a64..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/Delete/Delete_2x.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: 4d0e2d1c6e4fd4e4aab3c6b7d3f70b10 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/DeleteSure.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/DeleteSure.png deleted file mode 100644 index beb7adf3..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/DeleteSure.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/DeleteSure.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/DeleteSure.png.meta deleted file mode 100644 index a3ceeb27..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/004/DeleteSure.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: a4b11e2bd1df8ea46af1c3e779f3241d -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec.meta deleted file mode 100644 index 0430f73d..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a24c0907d3f562846bcd23f3e197fb24 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/AR寻宠-录入信息Effect.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/AR寻宠-录入信息Effect.png deleted file mode 100644 index 954553bf..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/AR寻宠-录入信息Effect.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/AR寻宠-录入信息Effect.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/AR寻宠-录入信息Effect.png.meta deleted file mode 100644 index efd876e0..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/AR寻宠-录入信息Effect.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: 48e99b00e747f6247a529ac49dd4bde7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background.meta deleted file mode 100644 index b0af4153..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e47c827b846a30545a520bbbbc800278 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background.png deleted file mode 100644 index f6701fd7..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background.png.meta deleted file mode 100644 index 47166d1f..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: 87764fe3d939b694283de209e2ee0961 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background2x.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background2x.png deleted file mode 100644 index a45e7e15..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background2x.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background2x.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background2x.png.meta deleted file mode 100644 index 41bfc81e..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetInfoRec/Background/Background2x.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: 3d75dee5dd379884b997bff687287385 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition.meta deleted file mode 100644 index da3ecbbe..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d1719ea148bf7e64c8f6820c790670ae -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/ARPetRecognition.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/ARPetRecognition.png deleted file mode 100644 index a5ba2840..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/ARPetRecognition.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/ARPetRecognition.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/ARPetRecognition.png.meta deleted file mode 100644 index 311f0644..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/ARPetRecognition.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: ebff31ebf3689d94c975d7d9521d6905 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI.meta deleted file mode 100644 index 648fc568..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 20803bf9c757985408d1624693f805ff -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_2x.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_2x.png deleted file mode 100644 index 76a37e64..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_2x.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_2x.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_2x.png.meta deleted file mode 100644 index d043f205..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_2x.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: b12702142ab711744a4b0c7748a590eb -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_Normal.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_Normal.png deleted file mode 100644 index 438241ba..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_Normal.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_Normal.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_Normal.png.meta deleted file mode 100644 index 32e363be..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/PetRecognition/SelectUI/Select_Normal.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: 49c33ff5fed24bf4295021e1a3636be4 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview.meta deleted file mode 100644 index 1c9cb3e2..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 826fe7dc6ef27284b80a03b54e8a9ad2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPetPreview.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPetPreview.png deleted file mode 100644 index df58ee0f..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPetPreview.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPetPreview.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPetPreview.png.meta deleted file mode 100644 index 304984b4..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPetPreview.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: 15240d2bc286da54289a80f647d125b8 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview.meta deleted file mode 100644 index 550d901c..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1c140a0ce59523e46b7933bfc0843316 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息.png deleted file mode 100644 index 4fbff93d..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息.png.meta deleted file mode 100644 index 613c47c9..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: f27bb0bd0e94f1b47970e0e98b611efd -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息@2x.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息@2x.png deleted file mode 100644 index e3274bec..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息@2x.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息@2x.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息@2x.png.meta deleted file mode 100644 index d06ad38e..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/ARPreview/宠物信息@2x.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: 7e185f877fba0cc4c9c34273624b98e7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet.meta deleted file mode 100644 index a089735d..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e7d9883a551eedc40be99f0a0dd7ac38 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物.png deleted file mode 100644 index b478e6b4..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物.png.meta deleted file mode 100644 index 69003cf0..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: 0b2576f1ecd86934fa8da25d254660ee -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物@2x.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物@2x.png deleted file mode 100644 index 9eaade3c..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物@2x.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物@2x.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物@2x.png.meta deleted file mode 100644 index 57f8505f..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Pet/赛博宠物@2x.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: d524938ec52b56c45a122fe40135b35c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone.meta deleted file mode 100644 index 1cd6cdea..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 68bf78cf86cacdf43bf0879a26d35150 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机.png deleted file mode 100644 index 8537c678..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机.png.meta deleted file mode 100644 index fd153d04..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: 1cd50c894a72fb545beb7e107e67d60f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机@2x.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机@2x.png deleted file mode 100644 index baab1f7c..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机@2x.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机@2x.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机@2x.png.meta deleted file mode 100644 index a9ac28bc..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Preview/Phone/手机@2x.png.meta +++ /dev/null @@ -1,182 +0,0 @@ -fileFormatVersion: 2 -guid: 629eb45973eded04d9cf44bd316ae59c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack.meta deleted file mode 100644 index 96efcfd2..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cd2d789ca0a7b19448d22402cb043ce5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/1.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/1.png deleted file mode 100644 index f2b6004c..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/1.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/1.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/1.png.meta deleted file mode 100644 index a4a668c5..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/1.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: 23ebaaeb56cdcf44e8d0f503fc7019d2 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Bored.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Bored.png deleted file mode 100644 index 1fe828f6..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Bored.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Bored.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Bored.png.meta deleted file mode 100644 index b5e18f82..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Bored.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: ed2cc276c35a5f34490181c54294e39c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Win64 - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food.meta deleted file mode 100644 index ceae2595..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4529b8b0e47ff0f4c8665a2b32a4daf7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials.meta deleted file mode 100644 index cfc97dbf..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 03ebb636cf588fd48b26265af90a348c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials/icecream-01.mat b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials/icecream-01.mat deleted file mode 100644 index faca965e..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials/icecream-01.mat +++ /dev/null @@ -1,84 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: icecream-01 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 8adc7582d5999224ca185e0f2bd3630f, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials/icecream-01.mat.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials/icecream-01.mat.meta deleted file mode 100644 index ed171e05..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/Materials/icecream-01.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaa99c2c096ed9c4fac92f60f2aa3af9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/icecream-01.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/icecream-01.png deleted file mode 100644 index b5fec707..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/icecream-01.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/icecream-01.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/icecream-01.png.meta deleted file mode 100644 index e6f4ad23..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/Food/icecream-01.png.meta +++ /dev/null @@ -1,156 +0,0 @@ -fileFormatVersion: 2 -guid: 8adc7582d5999224ca185e0f2bd3630f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 1 - swizzle: 50462976 - cookieLightType: 1 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody.meta deleted file mode 100644 index 11ce9dfa..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9fb0c90a7a2a2324c83293abb8fcfb92 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials.meta deleted file mode 100644 index e7cd5fdb..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a280aadcf3fb8e6439f29da1214e5d36 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sb0102.mat b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sb0102.mat deleted file mode 100644 index 2f49a4f1..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sb0102.mat +++ /dev/null @@ -1,84 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: sb0102 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 8a20c2f7992d84f4295d036ce39fb637, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sb0102.mat.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sb0102.mat.meta deleted file mode 100644 index 7c455b20..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sb0102.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 38e2746d00e43704480db7bdb7458fc3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sh01.mat b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sh01.mat deleted file mode 100644 index cac38a54..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sh01.mat +++ /dev/null @@ -1,84 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: sh01 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: e89e54fa64d5df0499da560ec06cb3e5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sh01.mat.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sh01.mat.meta deleted file mode 100644 index 1b86a9ac..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/Materials/sh01.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9146846e151bae244aaa388364f2c3e1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sb0102.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sb0102.png deleted file mode 100644 index 3bec409f..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sb0102.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sb0102.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sb0102.png.meta deleted file mode 100644 index 3d0a982a..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sb0102.png.meta +++ /dev/null @@ -1,156 +0,0 @@ -fileFormatVersion: 2 -guid: 8a20c2f7992d84f4295d036ce39fb637 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 1 - swizzle: 50462976 - cookieLightType: 1 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sh01.png b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sh01.png deleted file mode 100644 index 29050089..00000000 Binary files a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sh01.png and /dev/null differ diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sh01.png.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sh01.png.meta deleted file mode 100644 index f0dc37c3..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Snack/SnakeBody/sh01.png.meta +++ /dev/null @@ -1,156 +0,0 @@ -fileFormatVersion: 2 -guid: e89e54fa64d5df0499da560ec06cb3e5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 1 - swizzle: 50462976 - cookieLightType: 1 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Tmp.meta b/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Tmp.meta deleted file mode 100644 index ae9e93d3..00000000 --- a/EintooAR/Assets/AssetRaw/UIRaw/Atlas/YL/Tmp.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6e10d8de84bfaf648b8384725c901dd4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/Editor/XR/XRGeneralSettingsPerBuildTarget.asset b/EintooAR/Assets/Editor/XR/XRGeneralSettingsPerBuildTarget.asset index 4fe3d76b..31271326 100644 --- a/EintooAR/Assets/Editor/XR/XRGeneralSettingsPerBuildTarget.asset +++ b/EintooAR/Assets/Editor/XR/XRGeneralSettingsPerBuildTarget.asset @@ -108,5 +108,4 @@ MonoBehaviour: m_RequiresSettingsUpdate: 0 m_AutomaticLoading: 0 m_AutomaticRunning: 0 - m_Loaders: - - {fileID: 11400000, guid: 11927b8ffbeec3f46a3afd617773e3ae, type: 2} + m_Loaders: [] diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Common/Data/AR/ProjectData.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Common/Data/AR/ProjectData.cs index 655853dd..5815b826 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Common/Data/AR/ProjectData.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Common/Data/AR/ProjectData.cs @@ -31,6 +31,8 @@ namespace GameLogic [Title("Virtual Show Room in AssetBundle sceneName")] public List list_virtualShowRoomScenesName = new List(); + + } public enum ProjectType { diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/Manager/ARTrack/ARTrackManager.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/Manager/ARTrack/ARTrackManager.cs index 5bdbe95c..2f5f5bee 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/Manager/ARTrack/ARTrackManager.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/Manager/ARTrack/ARTrackManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using Cysharp.Threading.Tasks; @@ -140,26 +141,34 @@ namespace GameLogic private void AddTrackImagesToLibrary() { if (m_trackImages.Count == 0) return; - - // 创建运行时识别库 - var library = ScriptableObject.CreateInstance(); - var runtimeLibrary = (MutableRuntimeReferenceImageLibrary)(m_arTrackedImageManager.CreateRuntimeLibrary(library)); - - // 添加所有识别图到识别库 - foreach (var trackImage in m_trackImages.Values) + try { - if (trackImage._texture == null) continue; - - //添加识别图到运行时库 - runtimeLibrary.ScheduleAddImageWithValidationJob( - trackImage._texture, - trackImage._key, - 0.1f); // 设置识别图实际物理尺寸（米） - } + var library = ScriptableObject.CreateInstance(); + var runtimeLibrary = (MutableRuntimeReferenceImageLibrary)(m_arTrackedImageManager.CreateRuntimeLibrary(library)); - // 更新识别库 - m_arTrackedImageManager.referenceLibrary = runtimeLibrary; - m_arTrackedImageManager.enabled = true; + // 添加所有识别图到识别库 + foreach (var trackImage in m_trackImages.Values) + { + if (trackImage._texture == null) continue; + + //添加识别图到运行时库 + runtimeLibrary.ScheduleAddImageWithValidationJob( + trackImage._texture, + trackImage._key, + 0.1f); // 设置识别图实际物理尺寸（米） + } + // 创建运行时识别库 + + // 更新识别库 + m_arTrackedImageManager.referenceLibrary = runtimeLibrary; + m_arTrackedImageManager.enabled = true; + } + catch + { + + + } + } /// diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARBrochureHomeSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARBrochureHomeSystem.cs index 13f0d95d..b5aa8c1c 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARBrochureHomeSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARBrochureHomeSystem.cs @@ -17,11 +17,15 @@ namespace GameLogic 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"); GameObjectFactory.CreateDeviceOrientationGo(homeManager.transform,OrientationState.Portrait); + await UniTask.WaitForSeconds(.5f); await UniTask.Yield(); await ShowAsyncAllMainUI(); diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARTrackSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARTrackSystem.cs index 97519acc..4998b70e 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARTrackSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARTrackSystem.cs @@ -25,6 +25,7 @@ namespace GameLogic GameObjectFactory.CreateDeviceOrientationGo( m_arTrackManager.transform,OrientationState.Portrait); var glController = m_arTrackManager.gameObject.AddComponent(); + await m_arTrackManager.SetAndHandleTrack(_projectToSceneSavedData._projectData.List_arTrackData); GameModule.UI.ShowUI(); GameEvent.Send(UIProjectEventDefined.SettingProject, _projectToSceneSavedData); diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/CompanyDataConfigSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/CompanyDataConfigSystem.cs index f704e8b7..59bce806 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/CompanyDataConfigSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/CompanyDataConfigSystem.cs @@ -15,6 +15,7 @@ namespace GameLogic /// public async UniTask GetSingleProjectData(string page, string userCode) { + if (m_dictallProject.TryGetValue(userCode, out var projectData)) { return projectData; diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs index e7ac2b4d..ecccb091 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs @@ -20,7 +20,6 @@ namespace GameLogic public async UniTask Init() { await ConfigLanguage(); - } /// diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Tip/UIWindowPrivateTip.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Tip/UIWindowPrivateTip.cs index 7abeae5f..0a05e3d1 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Tip/UIWindowPrivateTip.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Tip/UIWindowPrivateTip.cs @@ -25,6 +25,6 @@ namespace GameLogic } #endregion - + } } \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Mobile/MobileBaseUtility.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Mobile/MobileBaseUtility.cs index e2fe160f..346191d7 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Mobile/MobileBaseUtility.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Mobile/MobileBaseUtility.cs @@ -11,7 +11,7 @@ namespace GameLogic /// public static void VibratePhone() { - Handheld.Vibrate(); + //Handheld.Vibrate(); } } } \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/GameApp.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/GameApp.cs index a097a202..550ea37f 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/GameApp.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/GameApp.cs @@ -61,6 +61,8 @@ public partial class GameApp : Singleton GameManager.Instance.Init(); GameEvent.Send(LoadEventDefine.InitSceneAndData, "场景加载完毕"); + + ARBrochureHomeSystem.Instance.LoadHomeRoom().Forget(); } diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/GameCore/Component/Character/CharacterFsmComponent.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/GameCore/Component/Character/CharacterFsmComponent.cs index 93c22ddc..bdf05394 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/GameCore/Component/Character/CharacterFsmComponent.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/GameCore/Component/Character/CharacterFsmComponent.cs @@ -24,7 +24,7 @@ namespace GameLogic /*GameEvent.AddEventListener(ITestMain_Event.SettingAnimationState, SettingAnimationState); GameEvent.Get().SettingAnimationState("daskdjhaksd");*/ - + m_characterControlfsm.Start(); m_characterAnimfsm.Start(); diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIARGameWindow/UIARGameWindow.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIARGameWindow/UIARGameWindow.cs index 0652966c..cbab8a02 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIARGameWindow/UIARGameWindow.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIARGameWindow/UIARGameWindow.cs @@ -46,7 +46,6 @@ namespace GameLogic base.OnCreate(); LoadARGameData(); - RegisterEvent(); } diff --git a/EintooAR/Assets/Plugins/VoxelBusters/link.xml b/EintooAR/Assets/Plugins/VoxelBusters/link.xml index b9e945f7..43968564 100644 --- a/EintooAR/Assets/Plugins/VoxelBusters/link.xml +++ b/EintooAR/Assets/Plugins/VoxelBusters/link.xml @@ -1,31 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/EintooAR/Assets/Scenes/main.unity b/EintooAR/Assets/Scenes/main.unity index 87cfe1da..cb8b3f1f 100644 --- a/EintooAR/Assets/Scenes/main.unity +++ b/EintooAR/Assets/Scenes/main.unity @@ -874,7 +874,7 @@ MonoBehaviour: m_MaxUnloadUnusedAssetsInterval: 300 m_UseSystemUnloadUnusedAssets: 1 packageName: DefaultPackage - playMode: 2 + playMode: 0 m_UpdatableWhilePlaying: 0 VerifyLevel: 1 m_ReadWritePathType: 0 diff --git a/EintooAR/ProjectSettings/ProjectSettings.asset b/EintooAR/ProjectSettings/ProjectSettings.asset index a5a23a47..1b418c7e 100644 --- a/EintooAR/ProjectSettings/ProjectSettings.asset +++ b/EintooAR/ProjectSettings/ProjectSettings.asset @@ -824,7 +824,7 @@ PlayerSettings: m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: UnityProject - metroPackageVersion: + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: @@ -832,7 +832,7 @@ PlayerSettings: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: UnityProject wsaImages: {} - metroTileShortName: + metroTileShortName: "\u82F1\u9886\u4E4B\u9014AR\u5BA3\u4F20\u518C\u8F6F\u4EF6V2.0" metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 diff --git a/EintooAR/UserSettings/Layouts/default-6000.dwlt b/EintooAR/UserSettings/Layouts/default-6000.dwlt index 7ce28f60..8d6945ce 100644 --- a/EintooAR/UserSettings/Layouts/default-6000.dwlt +++ b/EintooAR/UserSettings/Layouts/default-6000.dwlt @@ -19,247 +19,12 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Console - m_RootView: {fileID: 11} - m_MinSize: {x: 875, y: 300} + m_Title: Project + m_RootView: {fileID: 2} + m_MinSize: {x: 875, y: 498} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 730 - y: 0 - width: 673 - height: 338 - m_MinSize: {x: 232, y: 276} - m_MaxSize: {x: 10002, y: 10026} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1403 - y: 0 - width: 517 - height: 933 - m_MinSize: {x: 276, y: 76} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 8} - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 36 - width: 1920 - height: 933 - m_MinSize: {x: 400, y: 100} - m_MaxSize: {x: 32384, y: 16192} - vertical: 0 - controlID: 15 - draggingID: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 475 - height: 338 - m_MinSize: {x: 51, y: 76} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 5} - - {fileID: 7} - - {fileID: 2} - m_Position: - serializedVersion: 2 - x: 0 - y: 595 - width: 1403 - height: 338 - m_MinSize: {x: 300, y: 50} - m_MaxSize: {x: 24288, y: 8096} - vertical: 0 - controlID: 76 - draggingID: 0 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 475 - y: 0 - width: 255 - height: 338 - m_MinSize: {x: 232, y: 276} - m_MaxSize: {x: 10002, y: 10026} - m_ActualView: {fileID: 20} - m_Panes: - - {fileID: 20} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 13} - - {fileID: 6} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1403 - height: 933 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 16192} - vertical: 1 - controlID: 16 - draggingID: 0 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneHierarchyWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 317 - height: 595 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 982 - y: 0 - width: 421 - height: 595 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 22} - m_Panes: - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -272,22 +37,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} + - {fileID: 3} - {fileID: 4} - - {fileID: 14} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 height: 989 - m_MinSize: {x: 875, y: 300} + m_MinSize: {x: 875, y: 498} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 36 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &12 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -308,8 +73,8 @@ MonoBehaviour: height: 36 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: ---- !u!114 &13 + m_LastLoadedLayoutName: 2 by 3 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -322,21 +87,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 6} + - {fileID: 7} + - {fileID: 8} - {fileID: 9} - - {fileID: 15} - - {fileID: 10} m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 1403 - height: 595 - m_MinSize: {x: 300, y: 50} - m_MaxSize: {x: 24288, y: 8096} + y: 36 + width: 1920 + height: 933 + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 17 + controlID: 263 draggingID: 0 ---- !u!114 &14 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -357,7 +123,33 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &15 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 907 + height: 933 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 178 + draggingID: 0 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -372,18 +164,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 317 + x: 907 y: 0 - width: 665 - height: 595 + width: 308 + height: 933 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 21} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -391,152 +183,25 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Project\u200B" - m_Pos: + m_Children: [] + m_Position: serializedVersion: 2 - x: 731 - y: 24 - width: 671 - height: 312 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/StreamingAssets/package/DefaultPackage - m_Globs: [] - m_ProductIds: - m_AnyWithAssetOrigin: 0 - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 16 - m_LastFolders: - - Assets/StreamingAssets/package/DefaultPackage - m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\UnityProject\EintooAR\EintooAR - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 784} - m_SelectedIDs: 56140200 - m_LastClickedID: 136278 - m_ExpandedIDs: 00000000202c0100222c0100242c0100262c0100282c01002a2c01002c2c01002e2c0100302c0100322c0100342c0100362c0100382c01003a2c01003c2c0100 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 2} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000202c0100222c0100242c0100262c0100282c01002a2c01002c2c01002e2c0100302c0100322c0100342c0100362c0100382c01003a2c01003c2c0100 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 2} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 16 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 335 ---- !u!114 &17 + x: 1215 + y: 0 + width: 275 + height: 933 + m_MinSize: {x: 232, y: 276} + m_MaxSize: {x: 10002, y: 10026} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -544,35 +209,77 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 50, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Console\u200B" - m_Pos: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1490 + y: 0 + width: 430 + height: 933 + m_MinSize: {x: 276, y: 76} + m_MaxSize: {x: 4001, y: 4026} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: serializedVersion: 2 x: 0 - y: 24 - width: 474 - height: 312 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 ---- !u!114 &18 + y: 0 + width: 907 + height: 479 + m_MinSize: {x: 201, y: 226} + m_MaxSize: {x: 4001, y: 4026} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 479 + width: 907 + height: 454 + m_MinSize: {x: 201, y: 226} + m_MaxSize: {x: 4001, y: 4026} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -593,10 +300,10 @@ MonoBehaviour: m_TextWithWhitespace: "Hierarchy\u200B" m_Pos: serializedVersion: 2 - x: 0 + x: 908 y: 24 - width: 316 - height: 569 + width: 306 + height: 907 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -613,7 +320,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e037feff2ca7ffff84beffffd4beffffe4c8ffff12c9ffff5ee0ffffaee0ffff94ebffffe2ebffff2aeeffff + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -630,15 +337,15 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting - m_WindowGUID: 76ae4d3f4e2973d43bd48a0f53627560 ---- !u!114 &19 + m_WindowGUID: abcbaa4ac0552854a924a796a5c0f171 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -659,9 +366,9 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1404 + x: 1491 y: 24 - width: 516 + width: 429 height: 907 m_SerializedDataModeController: m_DataMode: 0 @@ -687,7 +394,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &20 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -708,10 +415,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 476 + x: 1216 y: 24 - width: 253 - height: 312 + width: 273 + height: 907 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -732,8 +439,9 @@ MonoBehaviour: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: [] + m_SearchArea: 0 + m_Folders: + - Assets m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -742,16 +450,17 @@ MonoBehaviour: m_FilterByTypeIntersection: 0 m_ViewMode: 0 m_StartGridSize: 64 - m_LastFolders: [] + m_LastFolders: + - Assets m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\UnityProject\EintooAR\EintooAR + m_LastProjectPath: /FTU/ m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} m_SelectedIDs: b0230000 m_LastClickedID: 9136 - m_ExpandedIDs: 00000000202c0100222c0100242c0100262c0100282c01002a2c01002c2c01002e2c0100302c0100322c0100342c0100362c0100382c01003a2c01003c2c0100 + m_ExpandedIDs: 0000000096230100a2230100382401007c240100f8240100fe2401005025010062250100222601004e26010050260100602601007a260100263c0200e49c0200e89c0200ea9c0200ec9c0200ee9c0200089e02000a9e02000c9e0200169e0200189e02005a9f020000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -780,7 +489,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000202c0100222c0100242c0100262c0100282c01002a2c01002c2c01002e2c0100302c0100322c0100342c0100362c0100382c01003a2c01003c2c0100 + m_ExpandedIDs: 0000000096230100a2230100382401007c240100f8240100fe2401005025010062250100222601004e26010050260100602601007a260100263c0200e49c0200e89c0200ea9c0200ec9c0200ee9c0200089e02000a9e02000c9e0200169e0200189e02005a9f020000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -797,7 +506,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 7} + m_ClientGUIView: {fileID: 0} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -838,7 +547,107 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 ---- !u!114 &21 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Game\u200B" + m_Pos: + serializedVersion: 2 + x: 0 + y: 503 + width: 906 + height: 428 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 906, y: 407} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 0 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -453 + m_HBaseRangeMax: 453 + m_VBaseRangeMin: -203.5 + m_VBaseRangeMax: 203.5 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 906 + height: 407 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 453, y: 203.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -453 + y: -203.5 + width: 906 + height: 407 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 906, y: 428} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -859,10 +668,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 318 + x: 0 y: 24 - width: 663 - height: 569 + width: 906 + height: 453 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -891,12 +700,12 @@ MonoBehaviour: displayed: 1 id: unity-grid-and-snap-toolbar index: 1 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-141.0,"y":149.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-141.0,"y":-128.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -141, y: 149} + snapOffset: {x: -141, y: -128} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 3 layout: 1 size: {x: 0, y: 0} sizeOverridden: 0 @@ -1282,7 +1091,7 @@ MonoBehaviour: containerId: overlay-container--right displayed: 0 id: Scene View/Tile Palette Brush Pick - index: 10 + index: 11 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 @@ -1338,7 +1147,7 @@ MonoBehaviour: containerId: overlay-container--right displayed: 0 id: Scene View/TrailRenderer - index: 11 + index: 10 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 @@ -1406,7 +1215,7 @@ MonoBehaviour: - containerId: Floating scrollOffset: 0 m_OverlaysVisible: 1 - m_WindowGUID: 61b675cb0eede5544abe5504e301c4cc + m_WindowGUID: 9fcc1a77f4a173e4982f4f2144f8e493 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 @@ -1417,9 +1226,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 7.4232273, y: 110.61884, z: -11.827865} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 7.4232273, y: 110.61884, z: -11.827865} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1447,12 +1256,12 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0, y: 0} zGrid: m_Fade: m_Target: 0 @@ -1460,18 +1269,18 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0, y: 0} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.014404182, y: 0.9774658, z: 0.07173838, w: 0.19809367} + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} speed: 2 - m_Value: {x: -0.014404182, y: 0.9774658, z: 0.07173838, w: 0.19809367} + m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_Size: - m_Target: 12.035873 + m_Target: 10 speed: 2 - m_Value: 12.035873 + m_Value: 10 m_Ortho: m_Target: 0 speed: 2 @@ -1489,10 +1298,10 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 21} + m_SceneView: {fileID: 16} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -1502,105 +1311,3 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_LastDebugDrawMode: 35 m_ViewIsLockedToObject: 0 ---- !u!114 &22 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Game\u200B" - m_Pos: - serializedVersion: 2 - x: 983 - y: 24 - width: 419 - height: 569 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - D:\Work\Unity\EintooAR\EintooAR\Library\PlayModeViewStates\4a31917ad18e4324e8836e1e012e77f6 - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 750, y: 1334} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 1 - m_SelectedSizes: 07000000000000000000000012000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -375 - m_HBaseRangeMax: 375 - m_VBaseRangeMin: -667 - m_VBaseRangeMax: 667 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 419 - height: 548 - m_Scale: {x: 0.41079462, y: 0.41079462} - m_Translation: {x: 209.5, y: 274} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -509.9872 - y: -667 - width: 1019.9744 - height: 1334 - m_MinimalGUI: 1 - m_defaultScale: 0.41079462 - m_LastWindowPixelSize: {x: 419, y: 569} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000001000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} diff --git a/GameServer/Bin/Debug/net9.0/APlugins.dll b/GameServer/Bin/Debug/net9.0/APlugins.dll index ed581911..6e9e0521 100644 Binary files a/GameServer/Bin/Debug/net9.0/APlugins.dll and b/GameServer/Bin/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Bin/Debug/net9.0/APlugins.pdb b/GameServer/Bin/Debug/net9.0/APlugins.pdb index 7e866004..8a23ec9c 100644 Binary files a/GameServer/Bin/Debug/net9.0/APlugins.pdb and b/GameServer/Bin/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Bin/Debug/net9.0/Entity.dll b/GameServer/Bin/Debug/net9.0/Entity.dll index bc3b8c64..8c872a30 100644 Binary files a/GameServer/Bin/Debug/net9.0/Entity.dll and b/GameServer/Bin/Debug/net9.0/Entity.dll differ diff --git a/GameServer/Bin/Debug/net9.0/Entity.pdb b/GameServer/Bin/Debug/net9.0/Entity.pdb index af19b177..7a45d2b8 100644 Binary files a/GameServer/Bin/Debug/net9.0/Entity.pdb and b/GameServer/Bin/Debug/net9.0/Entity.pdb differ diff --git a/GameServer/Bin/Debug/net9.0/Hotfix.dll b/GameServer/Bin/Debug/net9.0/Hotfix.dll index a9b53977..b5e6a7d9 100644 Binary files a/GameServer/Bin/Debug/net9.0/Hotfix.dll and b/GameServer/Bin/Debug/net9.0/Hotfix.dll differ diff --git a/GameServer/Bin/Debug/net9.0/Hotfix.pdb b/GameServer/Bin/Debug/net9.0/Hotfix.pdb index 6cacedb2..5c859560 100644 Binary files a/GameServer/Bin/Debug/net9.0/Hotfix.pdb and b/GameServer/Bin/Debug/net9.0/Hotfix.pdb differ diff --git a/GameServer/Bin/Debug/net9.0/Main.dll b/GameServer/Bin/Debug/net9.0/Main.dll index f5df5de0..d4ca81c1 100644 Binary files a/GameServer/Bin/Debug/net9.0/Main.dll and b/GameServer/Bin/Debug/net9.0/Main.dll differ diff --git a/GameServer/Bin/Debug/net9.0/Main.exe b/GameServer/Bin/Debug/net9.0/Main.exe index 9f7efb20..6b12c647 100644 Binary files a/GameServer/Bin/Debug/net9.0/Main.exe and b/GameServer/Bin/Debug/net9.0/Main.exe differ diff --git a/GameServer/Bin/Debug/net9.0/Main.pdb b/GameServer/Bin/Debug/net9.0/Main.pdb index 504f5178..b0fe6eeb 100644 Binary files a/GameServer/Bin/Debug/net9.0/Main.pdb and b/GameServer/Bin/Debug/net9.0/Main.pdb differ diff --git a/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.dll b/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.dll index ed581911..6e9e0521 100644 Binary files a/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.dll and b/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.pdb b/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.pdb index 7e866004..8a23ec9c 100644 Binary files a/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.pdb and b/GameServer/Server/APlugins/bin/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json b/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json index e08151ba..290eff29 100644 --- a/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json +++ b/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": {} + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": {} }, "projects": { - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -26,6 +26,7 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { diff --git a/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.g.props b/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.g.props index 2571d6c1..395b652f 100644 --- a/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.g.props +++ b/GameServer/Server/APlugins/obj/APlugins.csproj.nuget.g.props @@ -5,17 +5,17 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\qq137\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Administrator\.nuget\packages\;D:\IDE\VisualStudio\Component\NuGetPackages PackageReference 6.12.2 - - + + - C:\Users\qq137\.nuget\packages\fantasy-net.tools.exporternetworkprotocol\2024.2.24 - C:\Users\qq137\.nuget\packages\fantasy-net.tools.exporterconfigtable\2024.2.0 - C:\Users\qq137\.nuget\packages\fantasy-net.config\2024.1.4 + C:\Users\Administrator\.nuget\packages\fantasy-net.tools.exporternetworkprotocol\2024.2.24 + C:\Users\Administrator\.nuget\packages\fantasy-net.tools.exporterconfigtable\2024.2.0 + C:\Users\Administrator\.nuget\packages\fantasy-net.config\2024.1.4 \ No newline at end of file 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 5d780dc9..04b1cda4 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+93d69c1ff6fc3ec58a9401445592c13d80a5e8fc")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e8e14b3049e8886c8483d88ccd7cebcc5eb11370")] [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 317efc2e..78ac4be8 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 @@ -e921ce1fc41926ac48960caf7a6b4f93b4fa3ac39e90c5379537c824ab3c0aef +bc913da1df56db49f9f789a7a94b1facdf395934f0729b5f029168b7f3a4ff25 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 dd74ff68..bda9f668 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:\UnityProject\EintooAR\GameServer\Server\APlugins\ +build_property.ProjectDir = D:\Work\Unity\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 e25bed0e..eb0e854e 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.assets.cache and b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.assets.cache differ 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 45f611dd..258d41f7 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.AssemblyReference.cache and b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.CoreCompileInputs.cache b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.CoreCompileInputs.cache index 021eaaf1..e7404f21 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.CoreCompileInputs.cache +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -be82aedd3948869fc82be9e73832f5c0595a3ccdf2e06cd509dd95ec85df4810 +98ca17d8d4f5063cb093a0142e6b9983c7fb8ffed0da8c73dcad69a3ab640bab diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.FileListAbsolute.txt b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.FileListAbsolute.txt index e5b7cf49..5023d016 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.FileListAbsolute.txt +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.csproj.FileListAbsolute.txt @@ -58,3 +58,15 @@ D:\UnityProject\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.dl D:\UnityProject\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\refint\APlugins.dll D:\UnityProject\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.pdb D:\UnityProject\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\ref\APlugins.dll +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\bin\Debug\net9.0\APlugins.deps.json +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\bin\Debug\net9.0\APlugins.dll +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\bin\Debug\net9.0\APlugins.pdb +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.csproj.AssemblyReference.cache +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.GeneratedMSBuildEditorConfig.editorconfig +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.AssemblyInfoInputs.cache +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.AssemblyInfo.cs +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.csproj.CoreCompileInputs.cache +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.dll +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\refint\APlugins.dll +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\APlugins.pdb +D:\Work\Unity\EintooAR\GameServer\Server\APlugins\obj\Debug\net9.0\ref\APlugins.dll diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.dll b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.dll index ed581911..6e9e0521 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.dll and b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.pdb b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.pdb index 7e866004..8a23ec9c 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.pdb and b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/ref/APlugins.dll b/GameServer/Server/APlugins/obj/Debug/net9.0/ref/APlugins.dll index bf6ccc21..4c659086 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/ref/APlugins.dll and b/GameServer/Server/APlugins/obj/Debug/net9.0/ref/APlugins.dll differ diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/refint/APlugins.dll b/GameServer/Server/APlugins/obj/Debug/net9.0/refint/APlugins.dll index bf6ccc21..4c659086 100644 Binary files a/GameServer/Server/APlugins/obj/Debug/net9.0/refint/APlugins.dll and b/GameServer/Server/APlugins/obj/Debug/net9.0/refint/APlugins.dll differ diff --git a/GameServer/Server/APlugins/obj/project.assets.json b/GameServer/Server/APlugins/obj/project.assets.json index c5524262..565e131d 100644 --- a/GameServer/Server/APlugins/obj/project.assets.json +++ b/GameServer/Server/APlugins/obj/project.assets.json @@ -1242,23 +1242,23 @@ ] }, "packageFolders": { - "C:\\Users\\qq137\\.nuget\\packages\\": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} + "C:\\Users\\Administrator\\.nuget\\packages\\": {}, + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1267,6 +1267,7 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { diff --git a/GameServer/Server/APlugins/obj/project.nuget.cache b/GameServer/Server/APlugins/obj/project.nuget.cache index 761610ae..6dc837a4 100644 --- a/GameServer/Server/APlugins/obj/project.nuget.cache +++ b/GameServer/Server/APlugins/obj/project.nuget.cache @@ -1,37 +1,37 @@ { "version": 2, - "dgSpecHash": "W5My88bd6G0=", + "dgSpecHash": "7j59EEEN65k=", "success": true, - "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectFilePath": "D:\\Work\\Unity\\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", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net\\2024.2.22\\fantasy-net.2024.2.22.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.config\\2024.1.4\\fantasy-net.config.2024.1.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.configtable\\2024.2.0\\fantasy-net.configtable.2024.2.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.tools.exporterconfigtable\\2024.2.0\\fantasy-net.tools.exporterconfigtable.2024.2.0.nupkg.sha512", - "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.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", - "C:\\Users\\qq137\\.nuget\\packages\\mongodb.driver\\3.1.0\\mongodb.driver.3.1.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\protobuf-net\\3.2.45\\protobuf-net.3.2.45.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\protobuf-net.core\\3.2.45\\protobuf-net.core.3.2.45.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\sharpcompress\\0.30.1\\sharpcompress.0.30.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\snappier\\1.0.0\\snappier.1.0.0.nupkg.sha512", - "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.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", - "C:\\Users\\qq137\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512" + "C:\\Users\\Administrator\\.nuget\\packages\\commandlineparser\\2.9.1\\commandlineparser.2.9.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\dnsclient\\1.6.1\\dnsclient.1.6.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net\\2024.2.22\\fantasy-net.2024.2.22.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.config\\2024.1.4\\fantasy-net.config.2024.1.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.configtable\\2024.2.0\\fantasy-net.configtable.2024.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.tools.exporterconfigtable\\2024.2.0\\fantasy-net.tools.exporterconfigtable.2024.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.tools.exporternetworkprotocol\\2024.2.24\\fantasy-net.tools.exporternetworkprotocol.2024.2.24.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.7.0\\microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.logging\\8.7.0\\microsoft.identitymodel.logging.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.7.0\\microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mongodb.bson\\3.1.0\\mongodb.bson.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mongodb.driver\\3.1.0\\mongodb.driver.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\protobuf-net\\3.2.45\\protobuf-net.3.2.45.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\protobuf-net.core\\3.2.45\\protobuf-net.core.3.2.45.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sharpcompress\\0.30.1\\sharpcompress.0.30.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\snappier\\1.0.0\\snappier.1.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.collections.immutable\\7.0.0\\system.collections.immutable.7.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/GameServer/Server/APlugins/obj/project.packagespec.json b/GameServer/Server/APlugins/obj/project.packagespec.json index b232294a..3eb85a0c 100644 --- a/GameServer/Server/APlugins/obj/project.packagespec.json +++ b/GameServer/Server/APlugins/obj/project.packagespec.json @@ -1 +1 @@ -"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.203/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","projectName":"APlugins","projectPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj","outputPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\obj\\","projectStyle":"PackageReference","fallbackFolders":["D:\\IDE\\VisualStudio\\Component\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"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.203/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 9b22325a..b2cf2881 100644 --- a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info +++ b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17446243488696810 \ No newline at end of file +17446109807161287 \ 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 9b22325a..262d9b81 100644 --- a/GameServer/Server/APlugins/obj/rider.project.restore.info +++ b/GameServer/Server/APlugins/obj/rider.project.restore.info @@ -1 +1 @@ -17446243488696810 \ No newline at end of file +17457326683363870 \ No newline at end of file diff --git a/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.dll b/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.dll index ed581911..6e9e0521 100644 Binary files a/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.dll and b/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.pdb b/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.pdb index 7e866004..8a23ec9c 100644 Binary files a/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.pdb and b/GameServer/Server/Entity/bin/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Server/Entity/bin/Debug/net9.0/Entity.dll b/GameServer/Server/Entity/bin/Debug/net9.0/Entity.dll index bc3b8c64..8c872a30 100644 Binary files a/GameServer/Server/Entity/bin/Debug/net9.0/Entity.dll and b/GameServer/Server/Entity/bin/Debug/net9.0/Entity.dll differ diff --git a/GameServer/Server/Entity/bin/Debug/net9.0/Entity.pdb b/GameServer/Server/Entity/bin/Debug/net9.0/Entity.pdb index af19b177..7a45d2b8 100644 Binary files a/GameServer/Server/Entity/bin/Debug/net9.0/Entity.pdb and b/GameServer/Server/Entity/bin/Debug/net9.0/Entity.pdb differ 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 eeef3a48..5b5b64e6 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+93d69c1ff6fc3ec58a9401445592c13d80a5e8fc")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e8e14b3049e8886c8483d88ccd7cebcc5eb11370")] [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 50c251fa..01d03a94 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 @@ -9be4d22e32a3ffa9d6c641e983868b53bbfa8e5b7da48cd1ff9ebc76bff7099d +ac4f729b2677db5bfb34993d51cb5c7a53a196a00d8d2413ad6cdfdb32a5278a 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 2abfc8ee..67b28da8 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:\UnityProject\EintooAR\GameServer\Server\Entity\ +build_property.ProjectDir = D:\Work\Unity\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 2a32c750..deae871f 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.assets.cache and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.assets.cache differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache index c9638d68..9788195d 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.CoreCompileInputs.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.CoreCompileInputs.cache index 7261b1a2..5dc71ba9 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.CoreCompileInputs.cache +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -57f88ddec4d03f770012adec9657ae3040d3736ca41d413e6c10a5eab67a88a3 +e997837cf721d7aca21b1d8b779f675f9069ce7db0fdc7eb44ee7182bd8abc78 diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.FileListAbsolute.txt b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.FileListAbsolute.txt index 6de0a0ae..c17c4442 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.FileListAbsolute.txt +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.FileListAbsolute.txt @@ -106,3 +106,18 @@ D:\UnityProject\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.dll D:\UnityProject\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\refint\Entity.dll D:\UnityProject\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.pdb D:\UnityProject\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\ref\Entity.dll +D:\Work\Unity\EintooAR\GameServer\Server\Entity\bin\Debug\net9.0\Entity.deps.json +D:\Work\Unity\EintooAR\GameServer\Server\Entity\bin\Debug\net9.0\Entity.dll +D:\Work\Unity\EintooAR\GameServer\Server\Entity\bin\Debug\net9.0\Entity.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Entity\bin\Debug\net9.0\APlugins.dll +D:\Work\Unity\EintooAR\GameServer\Server\Entity\bin\Debug\net9.0\APlugins.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.csproj.AssemblyReference.cache +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.GeneratedMSBuildEditorConfig.editorconfig +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.AssemblyInfoInputs.cache +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.AssemblyInfo.cs +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.csproj.CoreCompileInputs.cache +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.csproj.Up2Date +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.dll +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\refint\Entity.dll +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\Entity.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Entity\obj\Debug\net9.0\ref\Entity.dll diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.dll b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.dll index bc3b8c64..8c872a30 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.dll and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.dll differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.pdb b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.pdb index af19b177..7a45d2b8 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.pdb and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.pdb differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/ref/Entity.dll b/GameServer/Server/Entity/obj/Debug/net9.0/ref/Entity.dll index 6406d82f..007e0652 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/ref/Entity.dll and b/GameServer/Server/Entity/obj/Debug/net9.0/ref/Entity.dll differ diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/refint/Entity.dll b/GameServer/Server/Entity/obj/Debug/net9.0/refint/Entity.dll index 6406d82f..007e0652 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/refint/Entity.dll and b/GameServer/Server/Entity/obj/Debug/net9.0/refint/Entity.dll differ diff --git a/GameServer/Server/Entity/obj/Entity.csproj.nuget.dgspec.json b/GameServer/Server/Entity/obj/Entity.csproj.nuget.dgspec.json index b42d3be7..2d13f238 100644 --- a/GameServer/Server/Entity/obj/Entity.csproj.nuget.dgspec.json +++ b/GameServer/Server/Entity/obj/Entity.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": {} + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": {} }, "projects": { - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -26,6 +26,7 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { @@ -91,20 +92,20 @@ } } }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "projectName": "Entity", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -113,14 +114,15 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" } } } diff --git a/GameServer/Server/Entity/obj/Entity.csproj.nuget.g.props b/GameServer/Server/Entity/obj/Entity.csproj.nuget.g.props index 2571d6c1..395b652f 100644 --- a/GameServer/Server/Entity/obj/Entity.csproj.nuget.g.props +++ b/GameServer/Server/Entity/obj/Entity.csproj.nuget.g.props @@ -5,17 +5,17 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\qq137\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Administrator\.nuget\packages\;D:\IDE\VisualStudio\Component\NuGetPackages PackageReference 6.12.2 - - + + - C:\Users\qq137\.nuget\packages\fantasy-net.tools.exporternetworkprotocol\2024.2.24 - C:\Users\qq137\.nuget\packages\fantasy-net.tools.exporterconfigtable\2024.2.0 - C:\Users\qq137\.nuget\packages\fantasy-net.config\2024.1.4 + C:\Users\Administrator\.nuget\packages\fantasy-net.tools.exporternetworkprotocol\2024.2.24 + C:\Users\Administrator\.nuget\packages\fantasy-net.tools.exporterconfigtable\2024.2.0 + C:\Users\Administrator\.nuget\packages\fantasy-net.config\2024.1.4 \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/project.assets.json b/GameServer/Server/Entity/obj/project.assets.json index 32622fa8..02b062a1 100644 --- a/GameServer/Server/Entity/obj/project.assets.json +++ b/GameServer/Server/Entity/obj/project.assets.json @@ -1480,23 +1480,23 @@ ] }, "packageFolders": { - "C:\\Users\\qq137\\.nuget\\packages\\": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} + "C:\\Users\\Administrator\\.nuget\\packages\\": {}, + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "projectName": "Entity", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1505,14 +1505,15 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" } } } diff --git a/GameServer/Server/Entity/obj/project.nuget.cache b/GameServer/Server/Entity/obj/project.nuget.cache index 64d2b278..b01c195c 100644 --- a/GameServer/Server/Entity/obj/project.nuget.cache +++ b/GameServer/Server/Entity/obj/project.nuget.cache @@ -1,41 +1,41 @@ { "version": 2, - "dgSpecHash": "lq0jqGeNNzM=", + "dgSpecHash": "zBYl/0/aFJM=", "success": true, - "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectFilePath": "D:\\Work\\Unity\\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", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net\\2024.2.24\\fantasy-net.2024.2.24.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.config\\2024.1.4\\fantasy-net.config.2024.1.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.configtable\\2024.2.0\\fantasy-net.configtable.2024.2.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.tools.exporterconfigtable\\2024.2.0\\fantasy-net.tools.exporterconfigtable.2024.2.0.nupkg.sha512", - "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.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", - "C:\\Users\\qq137\\.nuget\\packages\\mongodb.driver\\3.1.0\\mongodb.driver.3.1.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\protobuf-net\\3.2.45\\protobuf-net.3.2.45.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\protobuf-net.core\\3.2.45\\protobuf-net.core.3.2.45.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\sharpcompress\\0.30.1\\sharpcompress.0.30.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\snappier\\1.0.0\\snappier.1.0.0.nupkg.sha512", - "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.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", - "C:\\Users\\qq137\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512" + "C:\\Users\\Administrator\\.nuget\\packages\\commandlineparser\\2.9.1\\commandlineparser.2.9.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\dnsclient\\1.6.1\\dnsclient.1.6.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net\\2024.2.24\\fantasy-net.2024.2.24.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.config\\2024.1.4\\fantasy-net.config.2024.1.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.configtable\\2024.2.0\\fantasy-net.configtable.2024.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.tools.exporterconfigtable\\2024.2.0\\fantasy-net.tools.exporterconfigtable.2024.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.tools.exporternetworkprotocol\\2024.2.24\\fantasy-net.tools.exporternetworkprotocol.2024.2.24.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.7.0\\microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.7.0\\microsoft.identitymodel.jsonwebtokens.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.logging\\8.7.0\\microsoft.identitymodel.logging.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.7.0\\microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mongodb.bson\\3.1.0\\mongodb.bson.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mongodb.driver\\3.1.0\\mongodb.driver.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\protobuf-net\\3.2.45\\protobuf-net.3.2.45.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\protobuf-net.core\\3.2.45\\protobuf-net.core.3.2.45.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sharpcompress\\0.30.1\\sharpcompress.0.30.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\snappier\\1.0.0\\snappier.1.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.collections.immutable\\7.0.0\\system.collections.immutable.7.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.formats.asn1\\5.0.0\\system.formats.asn1.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.7.0\\system.identitymodel.tokens.jwt.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/project.packagespec.json b/GameServer/Server/Entity/obj/project.packagespec.json index 4e26180b..84841ac1 100644 --- a/GameServer/Server/Entity/obj/project.packagespec.json +++ b/GameServer/Server/Entity/obj/project.packagespec.json @@ -1 +1 @@ -"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.203/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","projectName":"Entity","projectPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj","outputPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\obj\\","projectStyle":"PackageReference","fallbackFolders":["D:\\IDE\\VisualStudio\\Component\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\Work\\Unity\\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.203/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 39f97ac1..fbab45f3 100644 --- a/GameServer/Server/Entity/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Entity/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17446243488702004 \ No newline at end of file +17446109807335860 \ 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 39f97ac1..262d9b81 100644 --- a/GameServer/Server/Entity/obj/rider.project.restore.info +++ b/GameServer/Server/Entity/obj/rider.project.restore.info @@ -1 +1 @@ -17446243488702004 \ No newline at end of file +17457326683363870 \ No newline at end of file diff --git a/GameServer/Server/Hotfix/Outter/Authentication/AuthenticationComponentSystem.cs b/GameServer/Server/Hotfix/Outter/Authentication/AuthenticationComponentSystem.cs index 6029e8a7..3afe6d6c 100644 --- a/GameServer/Server/Hotfix/Outter/Authentication/AuthenticationComponentSystem.cs +++ b/GameServer/Server/Hotfix/Outter/Authentication/AuthenticationComponentSystem.cs @@ -28,6 +28,8 @@ public static class AuthenticationComponentSystem } var position = HashCodeHelper.MurmurHash3(username) % self.AuthenticationCount; + + if (position != self.Position) { return GameErrorCode.UnauthorizedServer; @@ -36,6 +38,7 @@ public static class AuthenticationComponentSystem var scene = self.Scene; var database = scene.World.DataBase; var userCode = (long)username.GetHashCode(); + using (await scene.CoroutineLockComponent.Wait((int)ELockType.AuthenticationRegister,userCode)) { if (self.RegisterAccounts.ContainsKey(userCode)) @@ -122,6 +125,7 @@ public static class AuthenticationComponentSystem } var accountInfo = Entity.Create(scene,true,false); + if (account !=null) { account.Deserialize(scene); diff --git a/GameServer/Server/Hotfix/Outter/Authentication/JWT/AuthenticationJWTComponentSystem.cs b/GameServer/Server/Hotfix/Outter/Authentication/JWT/AuthenticationJWTComponentSystem.cs index a1c0771b..416fa5c2 100644 --- a/GameServer/Server/Hotfix/Outter/Authentication/JWT/AuthenticationJWTComponentSystem.cs +++ b/GameServer/Server/Hotfix/Outter/Authentication/JWT/AuthenticationJWTComponentSystem.cs @@ -57,9 +57,7 @@ public static class AuthenticationJWTComponentSystem { public static string GenerateToken(this AuthenticationJWTComponent self,long accountId) { - var header = new JwtHeader(self.JwtSigningCredentials); - var serverGatesAddress = ServerDataConfigHelper.GateAllServerData(SceneType.Gate); var gateAddress = serverGatesAddress[(int)(accountId % serverGatesAddress.Count)] ; var payload = new JwtPayload() diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.dll b/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.dll index ed581911..6e9e0521 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.dll and b/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.dll differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.pdb b/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.pdb index 7e866004..8a23ec9c 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.pdb and b/GameServer/Server/Hotfix/bin/Debug/net9.0/APlugins.pdb differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.dll b/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.dll index bc3b8c64..8c872a30 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.dll and b/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.dll differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.pdb b/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.pdb index af19b177..7a45d2b8 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.pdb and b/GameServer/Server/Hotfix/bin/Debug/net9.0/Entity.pdb differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.dll b/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.dll index a9b53977..b5e6a7d9 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.dll and b/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.dll differ diff --git a/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.pdb b/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.pdb index 6cacedb2..5c859560 100644 Binary files a/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.pdb and b/GameServer/Server/Hotfix/bin/Debug/net9.0/Hotfix.pdb differ 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 96d675b4..b0a9715f 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+93d69c1ff6fc3ec58a9401445592c13d80a5e8fc")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e8e14b3049e8886c8483d88ccd7cebcc5eb11370")] [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 0d95c5f9..b3cb8ba5 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 @@ -2b7041311f6a19a8b5d2fe00eaac9f6a3f66d84a1851b263ef47c61f4c5c28b9 +92f1c86c619c100306eae644f15e6c22047de5c0794dcb29f097a27b21d59319 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 6b63853a..6783eb48 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:\UnityProject\EintooAR\GameServer\Server\Hotfix\ +build_property.ProjectDir = D:\Work\Unity\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 7b0152fb..027a2119 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.assets.cache and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.assets.cache differ 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 fdeed505..3d9a6d04 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.CoreCompileInputs.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.CoreCompileInputs.cache index b8975049..f8638af1 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.CoreCompileInputs.cache +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e8e5ecd9894f99fad37f207ba55cd246e71c04d78d27961aa0171903849ce7de +7a28447882a848eaec46390f5c9d75e2809b99c4d99ccc1d418c9dd7290037c6 diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.FileListAbsolute.txt b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.FileListAbsolute.txt index 6127851c..17ba6eb2 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.FileListAbsolute.txt +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.FileListAbsolute.txt @@ -126,3 +126,20 @@ D:\UnityProject\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.dll D:\UnityProject\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\refint\Hotfix.dll D:\UnityProject\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.pdb D:\UnityProject\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\ref\Hotfix.dll +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\bin\Debug\net9.0\Hotfix.deps.json +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\bin\Debug\net9.0\Hotfix.dll +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\bin\Debug\net9.0\Hotfix.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\bin\Debug\net9.0\APlugins.dll +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\bin\Debug\net9.0\Entity.dll +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\bin\Debug\net9.0\Entity.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\bin\Debug\net9.0\APlugins.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.csproj.AssemblyReference.cache +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.GeneratedMSBuildEditorConfig.editorconfig +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.AssemblyInfoInputs.cache +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.AssemblyInfo.cs +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.csproj.CoreCompileInputs.cache +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.csproj.Up2Date +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.dll +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\refint\Hotfix.dll +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\Hotfix.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Hotfix\obj\Debug\net9.0\ref\Hotfix.dll diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.dll b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.dll index a9b53977..b5e6a7d9 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.dll and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.dll differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.pdb b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.pdb index 6cacedb2..5c859560 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.pdb and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.pdb differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/ref/Hotfix.dll b/GameServer/Server/Hotfix/obj/Debug/net9.0/ref/Hotfix.dll index 25a03117..35795c71 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/ref/Hotfix.dll and b/GameServer/Server/Hotfix/obj/Debug/net9.0/ref/Hotfix.dll differ diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/refint/Hotfix.dll b/GameServer/Server/Hotfix/obj/Debug/net9.0/refint/Hotfix.dll index 25a03117..35795c71 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/refint/Hotfix.dll and b/GameServer/Server/Hotfix/obj/Debug/net9.0/refint/Hotfix.dll differ diff --git a/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json b/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json index 9db5f1f4..a105ffdb 100644 --- a/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json +++ b/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": {} + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": {} }, "projects": { - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -26,6 +26,7 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { @@ -91,20 +92,20 @@ } } }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "projectName": "Entity", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -113,14 +114,15 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" } } } @@ -174,20 +176,20 @@ } } }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "projectName": "Hotfix", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -196,14 +198,15 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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" + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" } } } diff --git a/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.g.props b/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.g.props index 2571d6c1..395b652f 100644 --- a/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.g.props +++ b/GameServer/Server/Hotfix/obj/Hotfix.csproj.nuget.g.props @@ -5,17 +5,17 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\qq137\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Administrator\.nuget\packages\;D:\IDE\VisualStudio\Component\NuGetPackages PackageReference 6.12.2 - - + + - C:\Users\qq137\.nuget\packages\fantasy-net.tools.exporternetworkprotocol\2024.2.24 - C:\Users\qq137\.nuget\packages\fantasy-net.tools.exporterconfigtable\2024.2.0 - C:\Users\qq137\.nuget\packages\fantasy-net.config\2024.1.4 + C:\Users\Administrator\.nuget\packages\fantasy-net.tools.exporternetworkprotocol\2024.2.24 + C:\Users\Administrator\.nuget\packages\fantasy-net.tools.exporterconfigtable\2024.2.0 + C:\Users\Administrator\.nuget\packages\fantasy-net.config\2024.1.4 \ No newline at end of file diff --git a/GameServer/Server/Hotfix/obj/project.assets.json b/GameServer/Server/Hotfix/obj/project.assets.json index d73a45f5..b7743ebf 100644 --- a/GameServer/Server/Hotfix/obj/project.assets.json +++ b/GameServer/Server/Hotfix/obj/project.assets.json @@ -1498,23 +1498,23 @@ ] }, "packageFolders": { - "C:\\Users\\qq137\\.nuget\\packages\\": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} + "C:\\Users\\Administrator\\.nuget\\packages\\": {}, + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "projectName": "Hotfix", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1523,14 +1523,15 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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" + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\Work\\Unity\\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 4dd62124..405be4a1 100644 --- a/GameServer/Server/Hotfix/obj/project.nuget.cache +++ b/GameServer/Server/Hotfix/obj/project.nuget.cache @@ -1,41 +1,41 @@ { "version": 2, - "dgSpecHash": "TouK9+QjE6Q=", + "dgSpecHash": "txdXp+lSRkA=", "success": true, - "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectFilePath": "D:\\Work\\Unity\\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", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net\\2024.2.24\\fantasy-net.2024.2.24.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.config\\2024.1.4\\fantasy-net.config.2024.1.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.configtable\\2024.2.0\\fantasy-net.configtable.2024.2.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.tools.exporterconfigtable\\2024.2.0\\fantasy-net.tools.exporterconfigtable.2024.2.0.nupkg.sha512", - "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.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", - "C:\\Users\\qq137\\.nuget\\packages\\mongodb.driver\\3.1.0\\mongodb.driver.3.1.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\protobuf-net\\3.2.45\\protobuf-net.3.2.45.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\protobuf-net.core\\3.2.45\\protobuf-net.core.3.2.45.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\sharpcompress\\0.30.1\\sharpcompress.0.30.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\snappier\\1.0.0\\snappier.1.0.0.nupkg.sha512", - "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.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", - "C:\\Users\\qq137\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512" + "C:\\Users\\Administrator\\.nuget\\packages\\commandlineparser\\2.9.1\\commandlineparser.2.9.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\dnsclient\\1.6.1\\dnsclient.1.6.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net\\2024.2.24\\fantasy-net.2024.2.24.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.config\\2024.1.4\\fantasy-net.config.2024.1.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.configtable\\2024.2.0\\fantasy-net.configtable.2024.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.tools.exporterconfigtable\\2024.2.0\\fantasy-net.tools.exporterconfigtable.2024.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.tools.exporternetworkprotocol\\2024.2.24\\fantasy-net.tools.exporternetworkprotocol.2024.2.24.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.7.0\\microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.7.0\\microsoft.identitymodel.jsonwebtokens.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.logging\\8.7.0\\microsoft.identitymodel.logging.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.7.0\\microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mongodb.bson\\3.1.0\\mongodb.bson.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mongodb.driver\\3.1.0\\mongodb.driver.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\protobuf-net\\3.2.45\\protobuf-net.3.2.45.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\protobuf-net.core\\3.2.45\\protobuf-net.core.3.2.45.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sharpcompress\\0.30.1\\sharpcompress.0.30.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\snappier\\1.0.0\\snappier.1.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.collections.immutable\\7.0.0\\system.collections.immutable.7.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.formats.asn1\\5.0.0\\system.formats.asn1.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.7.0\\system.identitymodel.tokens.jwt.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/GameServer/Server/Hotfix/obj/project.packagespec.json b/GameServer/Server/Hotfix/obj/project.packagespec.json index 502db0a6..125323d1 100644 --- a/GameServer/Server/Hotfix/obj/project.packagespec.json +++ b/GameServer/Server/Hotfix/obj/project.packagespec.json @@ -1 +1 @@ -"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.203/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","projectName":"Hotfix","projectPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj","outputPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\","projectStyle":"PackageReference","fallbackFolders":["D:\\IDE\\VisualStudio\\Component\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\Work\\Unity\\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.203/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 18de19b0..09dfffe0 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17446243488709721 \ No newline at end of file +17446109807481174 \ 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 18de19b0..262d9b81 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.restore.info +++ b/GameServer/Server/Hotfix/obj/rider.project.restore.info @@ -1 +1 @@ -17446243488709721 \ No newline at end of file +17457326683363870 \ 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 cea776ab..7865c318 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+93d69c1ff6fc3ec58a9401445592c13d80a5e8fc")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e8e14b3049e8886c8483d88ccd7cebcc5eb11370")] [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 7893dd00..0af37878 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 @@ -bdec6df185994b1af86f341a674c5f39711943f372014406b428ef851b556cbf +344b401ebbeab0ff61df2282a02db041312ecde7f291a12d9d69dca5520f196e 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 33f083a6..91d0c623 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:\UnityProject\EintooAR\GameServer\Server\Main\ +build_property.ProjectDir = D:\Work\Unity\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 3c89e778..63c5c0e5 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.assets.cache and b/GameServer/Server/Main/obj/Debug/net9.0/Main.assets.cache differ 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 1056973f..665615f3 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache and b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.CoreCompileInputs.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.CoreCompileInputs.cache index 807dd411..855da3b1 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.CoreCompileInputs.cache +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -19917914e91ef5941f3fdf471f3ec5e8b1005ae15818b7fbbf92e808c820d143 +b98befd4d77ce5a843993e9b3c4ed2b290bca1d6e133f69b5932e60e87135381 diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.FileListAbsolute.txt b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.FileListAbsolute.txt index 4db1bc4f..825090ab 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.FileListAbsolute.txt +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.FileListAbsolute.txt @@ -166,3 +166,21 @@ D:\UnityProject\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\refint\Main.dll D:\UnityProject\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.pdb D:\UnityProject\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.genruntimeconfig.cache D:\UnityProject\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\ref\Main.dll +D:\Work\Unity\EintooAR\GameServer\Bin\Debug\net9.0\Main.exe +D:\Work\Unity\EintooAR\GameServer\Bin\Debug\net9.0\NLog.config +D:\Work\Unity\EintooAR\GameServer\Bin\Debug\net9.0\NLog.xsd +D:\Work\Unity\EintooAR\GameServer\Bin\Debug\net9.0\Main.deps.json +D:\Work\Unity\EintooAR\GameServer\Bin\Debug\net9.0\Main.runtimeconfig.json +D:\Work\Unity\EintooAR\GameServer\Bin\Debug\net9.0\Main.dll +D:\Work\Unity\EintooAR\GameServer\Bin\Debug\net9.0\Main.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.csproj.AssemblyReference.cache +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.GeneratedMSBuildEditorConfig.editorconfig +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.AssemblyInfoInputs.cache +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.AssemblyInfo.cs +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.csproj.CoreCompileInputs.cache +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.csproj.Up2Date +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.dll +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\refint\Main.dll +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.pdb +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\Main.genruntimeconfig.cache +D:\Work\Unity\EintooAR\GameServer\Server\Main\obj\Debug\net9.0\ref\Main.dll diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.dll b/GameServer/Server/Main/obj/Debug/net9.0/Main.dll index f5df5de0..d4ca81c1 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.dll and b/GameServer/Server/Main/obj/Debug/net9.0/Main.dll differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.genruntimeconfig.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.genruntimeconfig.cache index 63548a90..c9df53c4 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.genruntimeconfig.cache +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.genruntimeconfig.cache @@ -1 +1 @@ -4fc2a9db1190f9d2ae310054b3fb1ec136ad731de02ca1ba8a94a1dbd18cc51d +7c60d8e0b05bbdb4f513a4875d61f53530863a476eb5e156a20670406b623163 diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.pdb b/GameServer/Server/Main/obj/Debug/net9.0/Main.pdb index 504f5178..b0fe6eeb 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.pdb and b/GameServer/Server/Main/obj/Debug/net9.0/Main.pdb differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/apphost.exe b/GameServer/Server/Main/obj/Debug/net9.0/apphost.exe index 9f7efb20..6b12c647 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/apphost.exe and b/GameServer/Server/Main/obj/Debug/net9.0/apphost.exe differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/ref/Main.dll b/GameServer/Server/Main/obj/Debug/net9.0/ref/Main.dll index de3c4d86..f6b2a893 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/ref/Main.dll and b/GameServer/Server/Main/obj/Debug/net9.0/ref/Main.dll differ diff --git a/GameServer/Server/Main/obj/Debug/net9.0/refint/Main.dll b/GameServer/Server/Main/obj/Debug/net9.0/refint/Main.dll index de3c4d86..f6b2a893 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/refint/Main.dll and b/GameServer/Server/Main/obj/Debug/net9.0/refint/Main.dll differ diff --git a/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json b/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json index 32ce1b67..981d8e71 100644 --- a/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json +++ b/GameServer/Server/Main/obj/Main.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj": {} + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\Main.csproj": {} }, "projects": { - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", "projectName": "APlugins", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -26,6 +26,7 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { @@ -91,20 +92,20 @@ } } }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", "projectName": "Entity", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -113,14 +114,15 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" } } } @@ -174,20 +176,20 @@ } } }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", "projectName": "Hotfix", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -196,14 +198,15 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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" + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" } } } @@ -243,20 +246,20 @@ } } }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj": { + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\Main.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", "projectName": "Main", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -265,20 +268,21 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj" + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj" } } } diff --git a/GameServer/Server/Main/obj/Main.csproj.nuget.g.props b/GameServer/Server/Main/obj/Main.csproj.nuget.g.props index 2571d6c1..395b652f 100644 --- a/GameServer/Server/Main/obj/Main.csproj.nuget.g.props +++ b/GameServer/Server/Main/obj/Main.csproj.nuget.g.props @@ -5,17 +5,17 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\qq137\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Administrator\.nuget\packages\;D:\IDE\VisualStudio\Component\NuGetPackages PackageReference 6.12.2 - - + + - C:\Users\qq137\.nuget\packages\fantasy-net.tools.exporternetworkprotocol\2024.2.24 - C:\Users\qq137\.nuget\packages\fantasy-net.tools.exporterconfigtable\2024.2.0 - C:\Users\qq137\.nuget\packages\fantasy-net.config\2024.1.4 + C:\Users\Administrator\.nuget\packages\fantasy-net.tools.exporternetworkprotocol\2024.2.24 + C:\Users\Administrator\.nuget\packages\fantasy-net.tools.exporterconfigtable\2024.2.0 + C:\Users\Administrator\.nuget\packages\fantasy-net.config\2024.1.4 \ No newline at end of file diff --git a/GameServer/Server/Main/obj/project.assets.json b/GameServer/Server/Main/obj/project.assets.json index 986e3286..3e4d8fec 100644 --- a/GameServer/Server/Main/obj/project.assets.json +++ b/GameServer/Server/Main/obj/project.assets.json @@ -2662,23 +2662,23 @@ ] }, "packageFolders": { - "C:\\Users\\qq137\\.nuget\\packages\\": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} + "C:\\Users\\Administrator\\.nuget\\packages\\": {}, + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "projectUniqueName": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", "projectName": "Main", - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", - "packagesPath": "C:\\Users\\qq137\\.nuget\\packages\\", - "outputPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\obj\\", + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\IDE\\VisualStudio\\Component\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\qq137\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -2687,20 +2687,21 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, "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:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj" }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj": { + "projectPath": "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj" }, - "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { - "projectPath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj" + "D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj": { + "projectPath": "D:\\Work\\Unity\\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 7b4ad82d..c46e5208 100644 --- a/GameServer/Server/Main/obj/project.nuget.cache +++ b/GameServer/Server/Main/obj/project.nuget.cache @@ -1,49 +1,49 @@ { "version": 2, - "dgSpecHash": "YAbywGlPXtA=", + "dgSpecHash": "dFNwKn96yHc=", "success": true, - "projectFilePath": "D:\\UnityProject\\EintooAR\\GameServer\\Server\\Main\\Main.csproj", + "projectFilePath": "D:\\Work\\Unity\\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", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net\\2024.2.24\\fantasy-net.2024.2.24.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.config\\2024.1.4\\fantasy-net.config.2024.1.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.configtable\\2024.2.0\\fantasy-net.configtable.2024.2.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.nlog\\2024.1.20\\fantasy-net.nlog.2024.1.20.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\fantasy-net.tools.exporterconfigtable\\2024.2.0\\fantasy-net.tools.exporterconfigtable.2024.2.0.nupkg.sha512", - "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.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", - "C:\\Users\\qq137\\.nuget\\packages\\mongodb.driver\\3.1.0\\mongodb.driver.3.1.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\nlog\\5.3.4\\nlog.5.3.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\protobuf-net\\3.2.45\\protobuf-net.3.2.45.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\protobuf-net.core\\3.2.45\\protobuf-net.core.3.2.45.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\sharpcompress\\0.30.1\\sharpcompress.0.30.1.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\snappier\\1.0.0\\snappier.1.0.0.nupkg.sha512", - "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.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", - "C:\\Users\\qq137\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.runtime.linux-x64\\9.0.4\\microsoft.netcore.app.runtime.linux-x64.9.0.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.runtime.win-x64\\9.0.4\\microsoft.netcore.app.runtime.win-x64.9.0.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.windowsdesktop.app.runtime.win-x64\\9.0.4\\microsoft.windowsdesktop.app.runtime.win-x64.9.0.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.linux-x64\\9.0.4\\microsoft.aspnetcore.app.runtime.linux-x64.9.0.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.win-x64\\9.0.4\\microsoft.aspnetcore.app.runtime.win-x64.9.0.4.nupkg.sha512", - "C:\\Users\\qq137\\.nuget\\packages\\microsoft.netcore.app.host.linux-x64\\9.0.4\\microsoft.netcore.app.host.linux-x64.9.0.4.nupkg.sha512" + "C:\\Users\\Administrator\\.nuget\\packages\\commandlineparser\\2.9.1\\commandlineparser.2.9.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\dnsclient\\1.6.1\\dnsclient.1.6.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net\\2024.2.24\\fantasy-net.2024.2.24.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.config\\2024.1.4\\fantasy-net.config.2024.1.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.configtable\\2024.2.0\\fantasy-net.configtable.2024.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.nlog\\2024.1.20\\fantasy-net.nlog.2024.1.20.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.tools.exporterconfigtable\\2024.2.0\\fantasy-net.tools.exporterconfigtable.2024.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\fantasy-net.tools.exporternetworkprotocol\\2024.2.24\\fantasy-net.tools.exporternetworkprotocol.2024.2.24.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.7.0\\microsoft.identitymodel.abstractions.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.7.0\\microsoft.identitymodel.jsonwebtokens.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.logging\\8.7.0\\microsoft.identitymodel.logging.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.7.0\\microsoft.identitymodel.tokens.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mongodb.bson\\3.1.0\\mongodb.bson.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mongodb.driver\\3.1.0\\mongodb.driver.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\nlog\\5.3.4\\nlog.5.3.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\protobuf-net\\3.2.45\\protobuf-net.3.2.45.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\protobuf-net.core\\3.2.45\\protobuf-net.core.3.2.45.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sharpcompress\\0.30.1\\sharpcompress.0.30.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\snappier\\1.0.0\\snappier.1.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.collections.immutable\\7.0.0\\system.collections.immutable.7.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.formats.asn1\\5.0.0\\system.formats.asn1.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.7.0\\system.identitymodel.tokens.jwt.8.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\zstdsharp.port\\0.7.3\\zstdsharp.port.0.7.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.app.runtime.linux-x64\\9.0.4\\microsoft.netcore.app.runtime.linux-x64.9.0.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.app.runtime.win-x64\\9.0.4\\microsoft.netcore.app.runtime.win-x64.9.0.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.windowsdesktop.app.runtime.win-x64\\9.0.4\\microsoft.windowsdesktop.app.runtime.win-x64.9.0.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.linux-x64\\9.0.4\\microsoft.aspnetcore.app.runtime.linux-x64.9.0.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.win-x64\\9.0.4\\microsoft.aspnetcore.app.runtime.win-x64.9.0.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.app.host.linux-x64\\9.0.4\\microsoft.netcore.app.host.linux-x64.9.0.4.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/GameServer/Server/Main/obj/project.packagespec.json b/GameServer/Server/Main/obj/project.packagespec.json index 843198af..6a44f976 100644 --- a/GameServer/Server/Main/obj/project.packagespec.json +++ b/GameServer/Server/Main/obj/project.packagespec.json @@ -1 +1 @@ -"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.4, 9.0.4]"},{"name":"Microsoft.AspNetCore.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Host.linux-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Runtime.linux-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.WindowsDesktop.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.203/PortableRuntimeIdentifierGraph.json"}}"runtimes":{"linux-x64":{"#import":[]},"win-x64":{"#import":[]}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","projectName":"Main","projectPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\Main.csproj","outputPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Main\\obj\\","projectStyle":"PackageReference","fallbackFolders":["D:\\IDE\\VisualStudio\\Component\\NuGetPackages"],"originalTargetFrameworks":["net9.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj":{"projectPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\APlugins\\APlugins.csproj"},"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj":{"projectPath":"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Entity\\Entity.csproj"},"D:\\Work\\Unity\\EintooAR\\GameServer\\Server\\Hotfix\\Hotfix.csproj":{"projectPath":"D:\\Work\\Unity\\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.4, 9.0.4]"},{"name":"Microsoft.AspNetCore.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Host.linux-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Runtime.linux-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.NETCore.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"},{"name":"Microsoft.WindowsDesktop.App.Runtime.win-x64","version":"[9.0.4, 9.0.4]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.203/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 18de19b0..4a6dddb1 100644 --- a/GameServer/Server/Main/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Main/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17446243488709721 \ No newline at end of file +17446109807578886 \ 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 18de19b0..c1f2c7c1 100644 --- a/GameServer/Server/Main/obj/rider.project.restore.info +++ b/GameServer/Server/Main/obj/rider.project.restore.info @@ -1 +1 @@ -17446243488709721 \ No newline at end of file +17457326785045423 \ No newline at end of file