diff --git a/Assets/Artists/Scripts/GameService.meta b/Assets/Artists/Arts/Items.meta similarity index 77% rename from Assets/Artists/Scripts/GameService.meta rename to Assets/Artists/Arts/Items.meta index 1b5bf7436..48d8c40a2 100644 --- a/Assets/Artists/Scripts/GameService.meta +++ b/Assets/Artists/Arts/Items.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d6213801c4020124fb6cf6acf5308c1e +guid: 6e6f65966a5ecc24e91d5bc21164b8b8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Artists/Arts/Items/一万日元.png b/Assets/Artists/Arts/Items/一万日元.png new file mode 100644 index 000000000..8afa6fc8b Binary files /dev/null and b/Assets/Artists/Arts/Items/一万日元.png differ diff --git a/Assets/Artists/Arts/Items/一万日元.png.meta b/Assets/Artists/Arts/Items/一万日元.png.meta new file mode 100644 index 000000000..8c59012d3 --- /dev/null +++ b/Assets/Artists/Arts/Items/一万日元.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 7cbe927fd8b5d0241b10beb44e06220d +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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: 3 + 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: 3 + 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: 3 + 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: 3 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Arts/Items/护照.png b/Assets/Artists/Arts/Items/护照.png new file mode 100644 index 000000000..0f30dfb3c Binary files /dev/null and b/Assets/Artists/Arts/Items/护照.png differ diff --git a/Assets/Artists/Arts/Items/护照.png.meta b/Assets/Artists/Arts/Items/护照.png.meta new file mode 100644 index 000000000..20da679f6 --- /dev/null +++ b/Assets/Artists/Arts/Items/护照.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: e676be5449cf5514985b51e1fed94623 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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: 3 + 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: 3 + 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: 3 + 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: 3 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Arts/Items/护照内页.png b/Assets/Artists/Arts/Items/护照内页.png new file mode 100644 index 000000000..916f7a18f Binary files /dev/null and b/Assets/Artists/Arts/Items/护照内页.png differ diff --git a/Assets/Artists/Arts/Items/护照内页.png.meta b/Assets/Artists/Arts/Items/护照内页.png.meta new file mode 100644 index 000000000..bafdf8090 --- /dev/null +++ b/Assets/Artists/Arts/Items/护照内页.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 69dd023f233f15541b9e747c1c3783ea +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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: 3 + 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: 3 + 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: 3 + 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: 3 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Arts/Items/日本在留卡正面.png b/Assets/Artists/Arts/Items/日本在留卡正面.png new file mode 100644 index 000000000..801e02070 Binary files /dev/null and b/Assets/Artists/Arts/Items/日本在留卡正面.png differ diff --git a/Assets/Artists/Arts/Items/日本在留卡正面.png.meta b/Assets/Artists/Arts/Items/日本在留卡正面.png.meta new file mode 100644 index 000000000..3d3f83781 --- /dev/null +++ b/Assets/Artists/Arts/Items/日本在留卡正面.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 97960100e74ab4d4897888927ae56b7c +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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: 3 + 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: 3 + 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: 3 + 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: 3 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Arts/Items/日本在留卡背面.png b/Assets/Artists/Arts/Items/日本在留卡背面.png new file mode 100644 index 000000000..e4d209ce1 Binary files /dev/null and b/Assets/Artists/Arts/Items/日本在留卡背面.png differ diff --git a/Assets/Artists/Arts/Items/日本在留卡背面.png.meta b/Assets/Artists/Arts/Items/日本在留卡背面.png.meta new file mode 100644 index 000000000..6a1e0dd2e --- /dev/null +++ b/Assets/Artists/Arts/Items/日本在留卡背面.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 6a0dde238bd2dea40866cddd612c241c +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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: 3 + 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: 3 + 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: 3 + 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: 3 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/item_passport.asset b/Assets/Artists/Configs/Items/item_passport.asset new file mode 100644 index 000000000..b3b747e60 --- /dev/null +++ b/Assets/Artists/Configs/Items/item_passport.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: item_passport + m_EditorClassIdentifier: + id: 1007 + displayName: + rid: 7572707192357519366 + description: + rid: 7572707192357519367 + icon: {fileID: 21300000, guid: e676be5449cf5514985b51e1fed94623, type: 3} + rectangleIcon: {fileID: 21300000, guid: 69dd023f233f15541b9e747c1c3783ea, type: 3} + quality: 0 + maxStack: 1 + model: {fileID: 0} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 7572707192357519366 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u62A4\u7167" + - rid: 7572707192357519367 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u7F8A\u987F\u7684\u62A4\u7167" diff --git a/Assets/Artists/Scripts/Weather.meta b/Assets/Artists/Configs/Items/item_passport.asset.meta similarity index 52% rename from Assets/Artists/Scripts/Weather.meta rename to Assets/Artists/Configs/Items/item_passport.asset.meta index 4fc741f05..eedb48e73 100644 --- a/Assets/Artists/Scripts/Weather.meta +++ b/Assets/Artists/Configs/Items/item_passport.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 9b08be9a0aba8744ba63c5d4335171a9 -folderAsset: yes -DefaultImporter: +guid: dffd815ceea9c35409fd9b00466a5b37 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/item_residence_card.asset b/Assets/Artists/Configs/Items/item_residence_card.asset new file mode 100644 index 000000000..36eb8574a --- /dev/null +++ b/Assets/Artists/Configs/Items/item_residence_card.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: item_residence_card + m_EditorClassIdentifier: + id: 1008 + displayName: + rid: 7572707192357519368 + description: + rid: 7572707192357519369 + icon: {fileID: 21300000, guid: 97960100e74ab4d4897888927ae56b7c, type: 3} + rectangleIcon: {fileID: 21300000, guid: 6a0dde238bd2dea40866cddd612c241c, type: 3} + quality: 0 + maxStack: 1 + model: {fileID: 0} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 7572707192357519368 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u65E5\u672C\u5728\u7559\u5361" + - rid: 7572707192357519369 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u7C7B\u4F3C\u5916\u56FD\u4EBA\u8EAB\u4EFD\u8BC1" diff --git a/Assets/Artists/Scripts/GameService/Net.Like.Xue.Tokyo.GameService.Unity.asmdef.meta b/Assets/Artists/Configs/Items/item_residence_card.asset.meta similarity index 52% rename from Assets/Artists/Scripts/GameService/Net.Like.Xue.Tokyo.GameService.Unity.asmdef.meta rename to Assets/Artists/Configs/Items/item_residence_card.asset.meta index 38c22e38d..7bced2b55 100644 --- a/Assets/Artists/Scripts/GameService/Net.Like.Xue.Tokyo.GameService.Unity.asmdef.meta +++ b/Assets/Artists/Configs/Items/item_residence_card.asset.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 97858f2d82d5a4549a44f5d8e2dad161 -AssemblyDefinitionImporter: +guid: 27d9d00fdb0e6234f8e784664fcba09d +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset b/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset index 557678b40..f8564331e 100644 --- a/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset +++ b/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} m_Name: item_suitcase_yangdun m_EditorClassIdentifier: - id: 1006 + id: 1000 displayName: rid: 2091308013898957191 description: diff --git a/Assets/Artists/Configs/Items/item_yen_1w.asset b/Assets/Artists/Configs/Items/item_yen_1w.asset new file mode 100644 index 000000000..068b509e3 --- /dev/null +++ b/Assets/Artists/Configs/Items/item_yen_1w.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: item_yen_1w + m_EditorClassIdentifier: + id: 1006 + displayName: + rid: 7572707192357519364 + description: + rid: 7572707192357519365 + icon: {fileID: 21300000, guid: 7cbe927fd8b5d0241b10beb44e06220d, type: 3} + rectangleIcon: {fileID: 0} + quality: 6 + maxStack: 1 + model: {fileID: 0} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 7572707192357519364 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u4E00\u4E07\u65E5\u5143" + - rid: 7572707192357519365 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u7F8A\u987F\u5728\u673A\u573A\u5151\u6362\u7684\u4E00\u4E07\u65E5\u5143" diff --git a/Assets/Artists/Configs/Items/item_yen_1w.asset.meta b/Assets/Artists/Configs/Items/item_yen_1w.asset.meta new file mode 100644 index 000000000..800a89432 --- /dev/null +++ b/Assets/Artists/Configs/Items/item_yen_1w.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47e9bc1509e356449a49dec710c8351f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/URP/Project Wide.asset b/Assets/Artists/Configs/URP/Project Wide.asset index 2849a63bb..a8630155d 100644 --- a/Assets/Artists/Configs/URP/Project Wide.asset +++ b/Assets/Artists/Configs/URP/Project Wide.asset @@ -18,6 +18,7 @@ MonoBehaviour: m_RendererData: {fileID: 0} m_RendererDataList: - {fileID: 11400000, guid: 93cccca9ef477054a8d81556d01479c3, type: 2} + - {fileID: 11400000, guid: 1fd4892fd133faa48adcf89077cc5160, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 1 m_RequireOpaqueTexture: 0 diff --git a/Assets/Artists/Configs/reference_dictionary.asset b/Assets/Artists/Configs/reference_dictionary.asset index fea1ecdd0..393d0e662 100644 --- a/Assets/Artists/Configs/reference_dictionary.asset +++ b/Assets/Artists/Configs/reference_dictionary.asset @@ -26,4 +26,10 @@ MonoBehaviour: - Key: 1004 Value: item_taiyaki - Key: 1006 + Value: item_yen_1w + - Key: 1007 + Value: item_passport + - Key: 1008 + Value: item_residence_card + - Key: 1000 Value: item_suitcase_yangdun diff --git a/Assets/Artists/Configs/scriptable/scriptable_player_key_map.asset b/Assets/Artists/Configs/scriptable/scriptable_player_key_map.asset index f332f4602..0dbbe23be 100644 --- a/Assets/Artists/Configs/scriptable/scriptable_player_key_map.asset +++ b/Assets/Artists/Configs/scriptable/scriptable_player_key_map.asset @@ -32,6 +32,10 @@ MonoBehaviour: reloadAction: {fileID: -6032575603369888739, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} aimAction: {fileID: 5345126666820269769, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} fireAction: {fileID: 4390646709627658297, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} + inspectAction: {fileID: 0} cancelAction: {fileID: 7656137919724235468, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} inventoryAction: {fileID: 4731022410478041803, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} confirmAction: {fileID: 0} + verticalAction: {fileID: -6968881414383289150, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} + horizontalAction: {fileID: 389581113429227288, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} + handBrakeAction: {fileID: -8549420865234018997, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} diff --git a/Assets/Artists/Prefabs/Player_Base.prefab b/Assets/Artists/Prefabs/Player_Base.prefab index ae62e4e2d..93e7587cd 100644 --- a/Assets/Artists/Prefabs/Player_Base.prefab +++ b/Assets/Artists/Prefabs/Player_Base.prefab @@ -995,7 +995,7 @@ MonoBehaviour: CameraCollisionFilter: serializedVersion: 2 m_Bits: 1 - IgnoreTag: + IgnoreTag: IgnoreSelf CameraRadius: 0.2 DampingIntoCollision: 0 DampingFromCollision: 2 diff --git a/Assets/Artists/Prefabs/entity_base.prefab b/Assets/Artists/Prefabs/entity_base.prefab index 2ca69c12f..e2fa115bc 100644 --- a/Assets/Artists/Prefabs/entity_base.prefab +++ b/Assets/Artists/Prefabs/entity_base.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8476680858824443307} + - component: {fileID: 8769887305456792547} - component: {fileID: 2244576705691761675} - component: {fileID: 5725199466169488548} - component: {fileID: 3995385521791801434} @@ -39,6 +40,18 @@ Transform: - {fileID: 5497363902937938508} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8769887305456792547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8976090484005671666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 230e015069b45484f9c85d1aba1e901c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!95 &2244576705691761675 Animator: serializedVersion: 5 @@ -117,8 +130,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 054d7fc7589c04d4a8412a6f82b32d6c, type: 3} m_Name: m_EditorClassIdentifier: - worldNodeService: - rid: 550035622059573248 worldNode: rid: 550035622059573249 references: @@ -126,9 +137,6 @@ MonoBehaviour: RefIds: - rid: -2 type: {class: , ns: , asm: } - - rid: 550035622059573248 - type: {class: WorldNodeService, ns: BITKit.WorldNode, asm: BITKit.WorldNode} - data: - rid: 550035622059573249 type: {class: WorldInfoNode, ns: BITKit.WorldNode, asm: BITKit.WorldNode} data: diff --git a/Assets/Artists/Prefabs/node_minimap_camera.prefab b/Assets/Artists/Prefabs/node_minimap_camera.prefab index ccaf3d500..3a6d5335d 100644 --- a/Assets/Artists/Prefabs/node_minimap_camera.prefab +++ b/Assets/Artists/Prefabs/node_minimap_camera.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 641277380591036102} - component: {fileID: 1581052504808889130} - component: {fileID: 7102048011707431048} + - component: {fileID: 216702189712261225} m_Layer: 0 m_Name: node_minimap_camera m_TagString: Untagged @@ -97,12 +98,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: m_EditorClassIdentifier: - m_RenderShadows: 1 + m_RenderShadows: 0 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 m_Cameras: [] - m_RendererIndex: -1 + m_RendererIndex: 1 m_VolumeLayerMask: serializedVersion: 2 m_Bits: 1 @@ -141,16 +142,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 054d7fc7589c04d4a8412a6f82b32d6c, type: 3} m_Name: m_EditorClassIdentifier: - worldNodeService: - rid: 2091307956764147723 worldNode: rid: 2091307956764147724 references: version: 2 RefIds: - - rid: 2091307956764147723 - type: {class: WorldNodeService, ns: BITKit.WorldNode, asm: BITKit.WorldNode} - data: - rid: 2091307956764147724 type: {class: UnityMinimapNode, ns: Net.Project.B.WorldNode, asm: Net.Project.B.WorldNode} data: +--- !u!114 &216702189712261225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2363770275507355875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 230e015069b45484f9c85d1aba1e901c, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Artists/Prefabs/node_world_seat.prefab b/Assets/Artists/Prefabs/node_world_seat.prefab new file mode 100644 index 000000000..51d208c9f --- /dev/null +++ b/Assets/Artists/Prefabs/node_world_seat.prefab @@ -0,0 +1,180 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &370105375418376940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3422393629195425648} + m_Layer: 0 + m_Name: Exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3422393629195425648 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370105375418376940} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2402988338958111383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1207251289277488508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4195671699384884127} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4195671699384884127 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1207251289277488508} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2402988338958111383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1570469374308913984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2402988338958111383} + - component: {fileID: 1613880648422463962} + - component: {fileID: 996891010432962641} + - component: {fileID: 6254503417695566715} + - component: {fileID: 794105033654095496} + m_Layer: 0 + m_Name: node_world_seat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2402988338958111383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570469374308913984} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.024085999, y: 0.59829, z: 0.11948395} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4195671699384884127} + - {fileID: 3422393629195425648} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1613880648422463962 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570469374308913984} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &996891010432962641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570469374308913984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 230e015069b45484f9c85d1aba1e901c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6254503417695566715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570469374308913984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 054d7fc7589c04d4a8412a6f82b32d6c, type: 3} + m_Name: + m_EditorClassIdentifier: + worldNode: + rid: 7572707192357519361 + references: + version: 2 + RefIds: + - rid: 7572707192357519361 + type: {class: WorldInteractable, ns: Net.Project.B.Interaction, asm: Com.Project.B.Interaction} + data: + gameObject: {fileID: 1570469374308913984} +--- !u!114 &794105033654095496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570469374308913984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 054d7fc7589c04d4a8412a6f82b32d6c, type: 3} + m_Name: + m_EditorClassIdentifier: + worldNode: + rid: 7572707192357519362 + references: + version: 2 + RefIds: + - rid: 7572707192357519362 + type: {class: UnitySeatNode, ns: Net.Project.B.WorldNode, asm: Net.Project.B.WorldNode} + data: + cameraDistance: 2 + Rigidbody: {fileID: 0} + SeatObject: {fileID: 2402988338958111383} + CameraObject: {fileID: 4195671699384884127} + ExitObject: {fileID: 3422393629195425648} diff --git a/Assets/Artists/Scripts/Weather/Net.Like.Xue.Tokyo.Weather.Unity.asmdef.meta b/Assets/Artists/Prefabs/node_world_seat.prefab.meta similarity index 59% rename from Assets/Artists/Scripts/Weather/Net.Like.Xue.Tokyo.Weather.Unity.asmdef.meta rename to Assets/Artists/Prefabs/node_world_seat.prefab.meta index 286139da4..527e4a770 100644 --- a/Assets/Artists/Scripts/Weather/Net.Like.Xue.Tokyo.Weather.Unity.asmdef.meta +++ b/Assets/Artists/Prefabs/node_world_seat.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: dc40f4a6a57e06b499235c2a10cf715b -AssemblyDefinitionImporter: +guid: f5692551e69d33749b247e88a15c9ef6 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Artists/Scenes/map_initialize.unity b/Assets/Artists/Scenes/map_initialize.unity index 65ffe2d11..42ec11b7c 100644 --- a/Assets/Artists/Scenes/map_initialize.unity +++ b/Assets/Artists/Scenes/map_initialize.unity @@ -196,6 +196,7 @@ Transform: m_Children: - {fileID: 563786848} - {fileID: 839477909} + - {fileID: 2037061777} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &563786847 @@ -286,31 +287,31 @@ PrefabInstance: m_Modifications: - target: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} propertyPath: m_LocalPosition.x - value: 42.55271 + value: -57.22781 objectReference: {fileID: 0} - target: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} propertyPath: m_LocalPosition.y - value: 7.1451983 + value: 1.5929784 objectReference: {fileID: 0} - target: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} propertyPath: m_LocalPosition.z - value: 43.12441 + value: -77.36135 objectReference: {fileID: 0} - target: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} propertyPath: m_LocalRotation.w - value: 0.51210463 + value: 0.14972821 objectReference: {fileID: 0} - target: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} propertyPath: m_LocalRotation.x - value: 0.029599244 + value: 0.008850414 objectReference: {fileID: 0} - target: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} propertyPath: m_LocalRotation.y - value: 0.85698265 + value: -0.9869649 objectReference: {fileID: 0} - target: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} propertyPath: m_LocalRotation.z - value: -0.049532924 + value: 0.058339357 objectReference: {fileID: 0} - target: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -338,6 +339,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1653630182297145589, guid: 335b6bd86b0eab94db0d4acf14245043, type: 3} m_PrefabInstance: {fileID: 839477908} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2037061776 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 538493212} + m_Modifications: + - target: {fileID: 640654275765937479, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_Name + value: node_dialogue_camera + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalPosition.x + value: -57.22781 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalPosition.y + value: 1.5929784 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalPosition.z + value: -77.36135 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalRotation.w + value: 0.14972821 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalRotation.x + value: 0.008850414 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalRotation.y + value: -0.9869649 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalRotation.z + value: 0.058339357 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -119.036 + objectReference: {fileID: 0} + - target: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} +--- !u!4 &2037061777 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5415850140776146938, guid: dc960c78226e1e74abe082de2acc44a3, type: 3} + m_PrefabInstance: {fileID: 2037061776} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs b/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs deleted file mode 100644 index 16eb85e0c..000000000 --- a/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using BITKit.Entities; -using BITKit.WorldNode; -using Cysharp.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Net.Project.B.Interaction; -using Project.B.CharacterController; -using Project.B.Entities; -using Project.B.Map; -using UnityEngine; - -namespace Net.Like.Xue.Tokyo.GameService -{ - public class GamePortalPlayerService - { - private readonly ILogger _logger; - private readonly IWorldInteractionService _interactionService; - private readonly IPlayerFactory _playerFactory; - private readonly IWorldNodeService _worldNodeService; - private readonly IGameMapService _gameMapService; - private UniTaskCompletionSource _waitPlayer; - - public GamePortalPlayerService(IWorldInteractionService interactionService, IWorldNodeService worldNodeService, IGameMapService gameMapService, ILogger logger, IPlayerFactory playerFactory) - { - _interactionService = interactionService; - _worldNodeService = worldNodeService; - _gameMapService = gameMapService; - _logger = logger; - _playerFactory = playerFactory; - - _interactionService.OnInteraction += OnInteraction; - _playerFactory.OnEntityCreated += OnEntityCreated; - } - - private UniTask OnEntityCreated(string arg1, IEntity arg2) - { - _waitPlayer?.TrySetResult(arg2); - return UniTask.CompletedTask; - } - - private async void OnInteraction(object arg1, IWorldInteractable arg2, WorldInteractionProcess arg3, object arg4) - { - if(arg1 is IEntity entity is false)return; - if(arg3 is not WorldInteractionProcess.Performed)return; - if(entity.ServiceProvider.GetRequiredService() is not {} characterController)return; - if (_worldNodeService.WorldNodes.TryGetValue(arg2.Id, out var node) is false) return; - - if(node.OfType().FirstOrDefault() is not {MapName:not null} portalNode)return; - - if (string.IsNullOrEmpty(portalNode.MapName?.Value) is false) - { - _waitPlayer = new(); - await _gameMapService.StartMapAsync(portalNode.MapName.Value); - - var player = await _waitPlayer.Task; - characterController = player.ServiceProvider.GetRequiredService(); - } - - await Task.Delay(300); - - characterController.Position = portalNode.Position; - Vector3 eulerAngle = portalNode.EulerAngle; - characterController.Rotation = Quaternion.Euler(eulerAngle); - } - } -} diff --git a/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs.meta b/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs.meta deleted file mode 100644 index 715a8073a..000000000 --- a/Assets/Artists/Scripts/GameService/GamePortalPlayerService.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a4e30a80c3826ed43be03b8aafb25d27 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Artists/Scripts/GameService/GameSpawnPlayerService.cs b/Assets/Artists/Scripts/GameService/GameSpawnPlayerService.cs deleted file mode 100644 index 7a73abe30..000000000 --- a/Assets/Artists/Scripts/GameService/GameSpawnPlayerService.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Cysharp.Threading.Tasks; -using Project.B.Entities; -using Project.B.Map; -using UnityEngine; - -namespace Net.Like.Xue.Tokyo.GameService -{ - public class GameSpawnPlayerService - { - private readonly IGameMapService _gameMapService; - private readonly IPlayerFactory _playerFactory; - - public GameSpawnPlayerService(IGameMapService gameMapService, IPlayerFactory playerFactory) - { - _gameMapService = gameMapService; - _playerFactory = playerFactory; - - _gameMapService.OnMapChanged += OnMapChanged; - } - - private void OnMapChanged(Guid arg1, string arg2) - { - _playerFactory.CreateAsync(null,null).Forget(); - } - } - -} diff --git a/Assets/Artists/Scripts/GameService/Net.Like.Xue.Tokyo.GameService.Unity.asmdef b/Assets/Artists/Scripts/GameService/Net.Like.Xue.Tokyo.GameService.Unity.asmdef deleted file mode 100644 index 0d7d24e94..000000000 --- a/Assets/Artists/Scripts/GameService/Net.Like.Xue.Tokyo.GameService.Unity.asmdef +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "Net.Like.Xue.Tokyo.GameService.Unity", - "rootNamespace": "", - "references": [ - "GUID:14fe60d984bf9f84eac55c6ea033a8f4", - "GUID:12c795c5ebfb7b245a0399e28b4015e8", - "GUID:c469c0b0902774247810f42d61a18bd7", - "GUID:f51ebe6a0ceec4240a699833d6309b23", - "GUID:e527b3ce3106f974585be5134b6200e9", - "GUID:ecc5a2501a2c44d4cb8366674714f3d9", - "GUID:d750d221812bb1d48baff92e6ef73e28", - "GUID:d8b63aba1907145bea998dd612889d6b" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/Artists/Scripts/Program.cs b/Assets/Artists/Scripts/Program.cs index 0f8852eec..ddecbee28 100644 --- a/Assets/Artists/Scripts/Program.cs +++ b/Assets/Artists/Scripts/Program.cs @@ -34,9 +34,12 @@ namespace Net.Like.Xue.Tokyo serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); - serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); serviceCollection.AddSingleton>(); + serviceCollection.AddKeyedSingleton>(nameof(UXHud)); + serviceCollection.AddKeyedSingleton>(nameof(UXMap)); + serviceCollection.AddSingleton(); serviceCollection.AddSingleton>(); @@ -71,6 +74,9 @@ namespace Net.Like.Xue.Tokyo serviceProvider.GetRequiredService(); serviceProvider.GetRequiredService(); + + serviceProvider.GetRequiredKeyedService(nameof(UXHud)); + serviceProvider.GetRequiredKeyedService(nameof(UXMap)); var inventory = serviceProvider.GetRequiredService(); inventory.AutoInspect = ItemQuality.Develop; @@ -82,7 +88,10 @@ namespace Net.Like.Xue.Tokyo Application.targetFrameRate = 165; + BITApp.WalkUntilInitialize.TrySetResult(); await destroyCancellationToken.WaitUntilCanceled(); + + BITApp.WalkUntilInitialize = new(); } } diff --git a/Assets/Artists/Scripts/SetDayTime.cs b/Assets/Artists/Scripts/SetDayTime.cs deleted file mode 100644 index 9327d1564..000000000 --- a/Assets/Artists/Scripts/SetDayTime.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using BITKit; -using NodeCanvas.Framework; -using Pinwheel.Jupiter; -using UnityEngine; - -namespace Net.Like.Xue.Tokyo -{ - public class SetDayTime:MonoBehaviour - { - private JDayNightCycle _cycle; - private void Start() - { - _cycle = GetComponent(); - Data.AddListener("Time",OnSetTime); - destroyCancellationToken.Register(Dispose); - } - private void Dispose() - { - Data.RemoveListender("Time",OnSetTime); - } - - private void Update() - { - Data.Set("Time", _cycle.Time); - } - - private void OnSetTime(float obj) - { - _cycle.Time = obj; - } - } - -} - diff --git a/Assets/Artists/Scripts/UX/UXHud.cs b/Assets/Artists/Scripts/UX/UXHud.cs index 370c27e04..29c35123e 100644 --- a/Assets/Artists/Scripts/UX/UXHud.cs +++ b/Assets/Artists/Scripts/UX/UXHud.cs @@ -8,6 +8,7 @@ using BITKit.UX; using BITKit.UX.Hotkey; using BITKit.WorldNode; using Cysharp.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Net.Project.B.Emoji; using Net.Project.B.Interaction; using Net.Project.B.Quest; @@ -23,23 +24,23 @@ namespace Net.Like.Xue.Tokyo.UX { public class UXHud : UIToolKitPanel { + private readonly IEntitiesService _entitiesService; private readonly IPlayerFactory _playerFactory; private readonly IGameMapService _gameMapService; private readonly IWorldInteractionService _interactionService; - private readonly WorldInfoNodeService _worldInfoNodeService; private readonly IQuestService _questService; private readonly UXRadialMenu _radialMenu; [Inject] private IEmojiService _emojiService; - public UXHud(IUXService uxService, IGameMapService gameMapService, IWorldInteractionService interactionService, WorldInfoNodeService worldInfoNodeService, IQuestService questService, UXRadialMenu radialMenu, IPlayerFactory playerFactory) : base(uxService) + public UXHud(IUXService uxService, IGameMapService gameMapService, IWorldInteractionService interactionService, IQuestService questService, UXRadialMenu radialMenu, IPlayerFactory playerFactory, IEntitiesService entitiesService) : base(uxService) { _gameMapService = gameMapService; _interactionService = interactionService; - _worldInfoNodeService = worldInfoNodeService; _questService = questService; _radialMenu = radialMenu; _playerFactory = playerFactory; + _entitiesService = entitiesService; _gameMapService.OnMapChanged += OnMapChanged; @@ -72,7 +73,16 @@ namespace Net.Like.Xue.Tokyo.UX { case WorldInteractionProcess.Hover: _interactionTips.SetActive(true); - _interactionTips.text = _worldInfoNodeService.WorldInfoNodes.TryGetValue(arg2.Id, out var node) ? node.Name : "互动"; + if (_entitiesService.Entities.TryGetValue(arg2.Id, out var entity) && + entity.ServiceProvider.GetService() is { } infoNode && string.IsNullOrEmpty(infoNode.Name) is false) + { + _interactionTips.text = infoNode.Name; + } + else + { + _interactionTips.text = "互动"; + } + break; default: _interactionTips.SetActive(false); @@ -88,11 +98,7 @@ namespace Net.Like.Xue.Tokyo.UX protected override string DocumentPath => "ux_hud"; public override bool AllowInput => true; public override bool AllowCursor => false; - - [UXBindPath("minimap-container")] - private VisualElement _minimapContainer; - [UXBindPath("minimap-player")] - private VisualElement _miniPlayer; + [UXBindPath("interaction-tips")] private Label _interactionTips; [UXBindPath("time-slider")] @@ -117,10 +123,6 @@ namespace Net.Like.Xue.Tokyo.UX _interactionTips.SetActive(false); - _minimapContainer.RegisterCallback(x => - { - UXService.Entry(); - }); _timeSlider.RegisterValueChangedCallback(x => { Data.Set("Time", x.newValue); }); _questContainer.Clear(); @@ -138,7 +140,7 @@ namespace Net.Like.Xue.Tokyo.UX if (Keyboard.current is { capsLockKey: { wasPressedThisFrame: true } } or {mKey:{wasPressedThisFrame:true}}) { - UXService.Entry(); + UXService.Entry(); }else if (Keyboard.current is { f1Key: { wasPressedThisFrame: true } }) { var collection = new HotkeyCollection(); diff --git a/Assets/Artists/Scripts/UX/UXMap.cs b/Assets/Artists/Scripts/UX/UXMap.cs index fc1905da9..809db0dd3 100644 --- a/Assets/Artists/Scripts/UX/UXMap.cs +++ b/Assets/Artists/Scripts/UX/UXMap.cs @@ -2,12 +2,13 @@ using System.Collections; using System.Collections.Generic; using BITKit.UX; using Cysharp.Threading.Tasks; +using Net.Project.B.UX; using UnityEngine; using UnityEngine.UIElements; namespace Net.Like.Xue.Tokyo.UX { - public class UXMap : UIToolKitPanel + public class UXMap : UIToolKitPanel,IUXMap { public UXMap(IUXService uxService) : base(uxService) { @@ -15,14 +16,6 @@ namespace Net.Like.Xue.Tokyo.UX protected override string DocumentPath => "ux_map"; public override bool CloseWhenClickOutside => true; public override bool AllowCursor => true; - - [UXBindPath("minimap-container")] - private VisualElement _minimapContainer; - [UXBindPath("minimap-player")] - private VisualElement _miniPlayer; - - private Camera _minimapCamera; - private Camera _mainCamera; } } diff --git a/Assets/Artists/Scripts/Weather/Net.Like.Xue.Tokyo.Weather.Unity.asmdef b/Assets/Artists/Scripts/Weather/Net.Like.Xue.Tokyo.Weather.Unity.asmdef deleted file mode 100644 index 215e0936e..000000000 --- a/Assets/Artists/Scripts/Weather/Net.Like.Xue.Tokyo.Weather.Unity.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Net.Like.Xue.Tokyo.Weather.Unity", - "rootNamespace": "", - "references": [ - "GUID:14fe60d984bf9f84eac55c6ea033a8f4" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/Artists/Scripts/Weather/ScriptableWeather.cs b/Assets/Artists/Scripts/Weather/ScriptableWeather.cs deleted file mode 100644 index 0443d4363..000000000 --- a/Assets/Artists/Scripts/Weather/ScriptableWeather.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BITKit; -using UnityEngine; - -#if UNITY_EDITOR -using UnityEditor; -#endif - -namespace Net.Like.Xue.Tokyo.Weather -{ - public class ScriptableWeather : ScriptableObject - { - #if UNITY_EDITOR - [SerializeField] private LightingDataAsset lightingDataAsset; - #endif - [SerializeField] private Vector3 sunLightDirection = new Vector3(0, 1, 0); - [SerializeField] private Color sunLightColor; - [SerializeField] private float sunLightIntensity = 1; - [SerializeField] private Material skyboxMaterial; - [SerializeField] private FogMode fogMode; - [SerializeField] private Color fogColor; - [SerializeField] private float fogDensity; - - [BIT] - public void Save() - { -#if UNITY_EDITOR - lightingDataAsset = Lightmapping.lightingDataAsset; - #endif - - sunLightDirection = RenderSettings.sun.transform.eulerAngles; - sunLightIntensity = RenderSettings.sun.intensity; - sunLightColor = RenderSettings.sun.color; - - skyboxMaterial = RenderSettings.skybox; - - fogMode = RenderSettings.fogMode; - fogColor = RenderSettings.fogColor; - fogDensity = RenderSettings.fogDensity; -#if UNITY_EDITOR - EditorUtility.SetDirty(this); - #endif - } - - [BIT] - public void Load() - { -#if UNITY_EDITOR - Lightmapping.lightingDataAsset = lightingDataAsset; - #endif - RenderSettings.sun.transform.eulerAngles = sunLightDirection; - RenderSettings.sun.intensity = sunLightIntensity; - RenderSettings.skybox = skyboxMaterial; - RenderSettings.fogMode = fogMode; - RenderSettings.fogColor = fogColor; - RenderSettings.fogDensity = fogDensity; - } - } - -} - diff --git a/Assets/Artists/Scripts/Weather/ScriptableWeather.cs.meta b/Assets/Artists/Scripts/Weather/ScriptableWeather.cs.meta deleted file mode 100644 index 374e85579..000000000 --- a/Assets/Artists/Scripts/Weather/ScriptableWeather.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1ee90b8fd1e6ff14188e5fd9f8502255 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Artists/UX/ui_item_inspector.uxml b/Assets/Artists/UX/ui_item_inspector.uxml index a94c2885d..cf0616756 100644 --- a/Assets/Artists/UX/ui_item_inspector.uxml +++ b/Assets/Artists/UX/ui_item_inspector.uxml @@ -2,10 +2,9 @@