diff --git a/Assets/Casts.meta b/Assets/Casts.meta deleted file mode 100644 index f602dbf7..00000000 --- a/Assets/Casts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 47d32c4eaa4a95e4d9714f10ef55d7b6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Casts/cast.png b/Assets/Casts/cast.png deleted file mode 100644 index d04b1c6a..00000000 Binary files a/Assets/Casts/cast.png and /dev/null differ diff --git a/Assets/Casts/cast.png.meta b/Assets/Casts/cast.png.meta deleted file mode 100644 index cd480d0f..00000000 --- a/Assets/Casts/cast.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 67df7bcd07266884da767e7f928e8444 -TextureImporter: - internalIDToNameTable: - - first: - 213: -6029805042903605803 - second: cast_0 - 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: 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: 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: 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 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: cast_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 164 - height: 158 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 5dd1fd0c244d15ca0800000000000000 - internalID: -6029805042903605803 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - cast_0: -6029805042903605803 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Casts/cast1.png b/Assets/Casts/cast1.png deleted file mode 100644 index fd06b26e..00000000 Binary files a/Assets/Casts/cast1.png and /dev/null differ diff --git a/Assets/Casts/cast1.png.meta b/Assets/Casts/cast1.png.meta deleted file mode 100644 index 0a7409e5..00000000 --- a/Assets/Casts/cast1.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 4fb7e972df077cd4ebd48c759498176b -TextureImporter: - internalIDToNameTable: - - first: - 213: 6752687263104640217 - second: cast1_0 - 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: 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: 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: 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 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: cast1_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 72 - height: 66 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 9d428acd94d56bd50800000000000000 - internalID: 6752687263104640217 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - cast1_0: 6752687263104640217 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Casts/cast2.png b/Assets/Casts/cast2.png deleted file mode 100644 index eb9f0e58..00000000 Binary files a/Assets/Casts/cast2.png and /dev/null differ diff --git a/Assets/Casts/cast2.png.meta b/Assets/Casts/cast2.png.meta deleted file mode 100644 index 01bb9954..00000000 --- a/Assets/Casts/cast2.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 3e8cc9b7e9900ac44b5bfc0717736f5a -TextureImporter: - internalIDToNameTable: - - first: - 213: 3098412546160358732 - second: cast2_0 - 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: 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: 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: 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 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: cast2_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 213 - height: 177 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: c45708d6bc5cffa20800000000000000 - internalID: 3098412546160358732 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - cast2_0: 3098412546160358732 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Casts/cast3.png b/Assets/Casts/cast3.png deleted file mode 100644 index 148e6914..00000000 Binary files a/Assets/Casts/cast3.png and /dev/null differ diff --git a/Assets/Casts/cast3.png.meta b/Assets/Casts/cast3.png.meta deleted file mode 100644 index ae0eaff8..00000000 --- a/Assets/Casts/cast3.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 45fedb7a7c6ed6f43b68dc76c10ac740 -TextureImporter: - internalIDToNameTable: - - first: - 213: -3281725315939787795 - second: cast3_0 - 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: 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: 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: 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 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: cast3_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 169 - height: 163 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: deb90056638f472d0800000000000000 - internalID: -3281725315939787795 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - cast3_0: -3281725315939787795 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/CNN_model.onnx b/Assets/Models/CNN_model.onnx index e55c2dd9..6e81124a 100644 Binary files a/Assets/Models/CNN_model.onnx and b/Assets/Models/CNN_model.onnx differ diff --git a/Assets/Prefabs/Map/Main Camera.prefab b/Assets/Prefabs/Map/Main Camera.prefab index bbba0874..e679f647 100644 --- a/Assets/Prefabs/Map/Main Camera.prefab +++ b/Assets/Prefabs/Map/Main Camera.prefab @@ -277,6 +277,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 495f274634c281c4eb5b89adadbf3fd5, type: 3} m_Name: m_EditorClassIdentifier: + playerTransform: {fileID: 0} + roomOffset: {x: 20, y: 15} + smoothSpeed: 2 + movementCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + useTimeScale: 0 + timeScaleMultiplier: 0.3 + timeScaleTransitionSpeed: 3 --- !u!1 &3826588424710546158 GameObject: m_ObjectHideFlags: 0 @@ -325,6 +355,9 @@ MonoBehaviour: cam: {fileID: 5407641305878120686} minDistanceForNewPoint: 0.1 secondsForLineToLive: 3 + modelAsset: {fileID: 0} + confidenceThreshold: 0.5 + playerAttack: {fileID: 0} --- !u!1 &7995828583464354044 GameObject: m_ObjectHideFlags: 0 @@ -373,3 +406,6 @@ MonoBehaviour: cam: {fileID: 5407641305878120686} minDistanceForNewPoint: 0.1 secondsForLineToLive: 3 + modelAsset: {fileID: 5022602860645237092, guid: 9771fab52029fa140bf3b8e1beb5ee3d, type: 3} + confidenceThreshold: 0.5 + playerAttack: {fileID: 0} diff --git a/Assets/Scenes/LevelCave000.unity b/Assets/Scenes/LevelCave000.unity index 610618b8..0c8c9501 100644 --- a/Assets/Scenes/LevelCave000.unity +++ b/Assets/Scenes/LevelCave000.unity @@ -59306,9 +59306,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f0794fe08ee8be4dbadd94a16bbe227, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2069965243 stripped +--- !u!4 &2069965255 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5777876314397871891, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} + m_PrefabInstance: {fileID: 2069965241} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2069965257 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3059513110413570464, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} + m_CorrespondingSourceObject: {fileID: 7928863086052366388, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} m_PrefabInstance: {fileID: 2069965241} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -59317,11 +59322,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a94809e5f802a54486e033862ad1e92, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &2069965255 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5777876314397871891, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} - m_PrefabInstance: {fileID: 2069965241} - m_PrefabAsset: {fileID: 0} --- !u!1 &2071019389 GameObject: m_ObjectHideFlags: 0 @@ -62246,10 +62246,10 @@ PrefabInstance: - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} propertyPath: playerAttack value: - objectReference: {fileID: 2069965243} + objectReference: {fileID: 2069965257} - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} propertyPath: confidenceThreshold - value: 0.5 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} propertyPath: minDistanceForNewPoint diff --git a/Assets/Scenes/LevelCave001.unity b/Assets/Scenes/LevelCave001.unity index a0b99081..66afc347 100644 --- a/Assets/Scenes/LevelCave001.unity +++ b/Assets/Scenes/LevelCave001.unity @@ -32277,6 +32277,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 5777876314397871891, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} m_PrefabInstance: {fileID: 1473228122} m_PrefabAsset: {fileID: 0} +--- !u!114 &1473228124 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7928863086052366388, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} + m_PrefabInstance: {fileID: 1473228122} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a94809e5f802a54486e033862ad1e92, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1487900462 GameObject: m_ObjectHideFlags: 0 @@ -47177,6 +47188,10 @@ PrefabInstance: propertyPath: m_Name value: Main Camera objectReference: {fileID: 0} + - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} + propertyPath: playerAttack + value: + objectReference: {fileID: 1473228124} - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} propertyPath: minDistanceForNewPoint value: 0.01 diff --git a/Assets/Scenes/LevelCave002.unity b/Assets/Scenes/LevelCave002.unity index e3129d69..7eacb6aa 100644 --- a/Assets/Scenes/LevelCave002.unity +++ b/Assets/Scenes/LevelCave002.unity @@ -29493,6 +29493,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} + propertyPath: playerAttack + value: + objectReference: {fileID: 7061210490581720646} - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} propertyPath: minDistanceForNewPoint value: 0.01 @@ -43759,6 +43763,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} +--- !u!114 &7061210490581720646 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7928863086052366388, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} + m_PrefabInstance: {fileID: 7061210490581720645} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a94809e5f802a54486e033862ad1e92, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8871312783015003814 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LevelTest.unity b/Assets/Scenes/LevelTest.unity index e3d76b32..8939c723 100644 --- a/Assets/Scenes/LevelTest.unity +++ b/Assets/Scenes/LevelTest.unity @@ -789,6 +789,10 @@ PrefabInstance: propertyPath: m_Name value: Main Camera objectReference: {fileID: 0} + - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} + propertyPath: playerAttack + value: + objectReference: {fileID: 1529157881} - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} propertyPath: minDistanceForNewPoint value: 0.01 @@ -1455,6 +1459,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 5777876314397871891, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} m_PrefabInstance: {fileID: 1529157879} m_PrefabAsset: {fileID: 0} +--- !u!114 &1529157881 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7928863086052366388, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} + m_PrefabInstance: {fileID: 1529157879} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a94809e5f802a54486e033862ad1e92, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1575030077 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TestDungeon.unity b/Assets/Scenes/TestDungeon.unity index 91c1e692..a3d95243 100644 --- a/Assets/Scenes/TestDungeon.unity +++ b/Assets/Scenes/TestDungeon.unity @@ -36460,6 +36460,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} + propertyPath: playerAttack + value: + objectReference: {fileID: 1742054076} - target: {fileID: 8592874354941162426, guid: 33a174d67d9774443b9fb97f4d01fbf3, type: 3} propertyPath: minDistanceForNewPoint value: 0.01 @@ -36931,7 +36935,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ee386737a2d10641bfc210068caab4a, type: 3} m_Name: m_EditorClassIdentifier: - knockbackForce: 200 --- !u!114 &1496138197 MonoBehaviour: m_ObjectHideFlags: 0 @@ -43308,6 +43311,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 5777876314397871891, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} m_PrefabInstance: {fileID: 1742054074} m_PrefabAsset: {fileID: 0} +--- !u!114 &1742054076 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7928863086052366388, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} + m_PrefabInstance: {fileID: 1742054074} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a94809e5f802a54486e033862ad1e92, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1742054080 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6377138182487133699, guid: bb4327f9df90a284d9b258ee549f253b, type: 3} diff --git a/Assets/Scripts/Player/LineDrawer.cs b/Assets/Scripts/Player/LineDrawer.cs index d24a7f92..50d276cd 100644 --- a/Assets/Scripts/Player/LineDrawer.cs +++ b/Assets/Scripts/Player/LineDrawer.cs @@ -35,8 +35,8 @@ public class LineDrawer : MonoBehaviour "Earth2", "Earth3", "Fire1", - "Fire2", "Fire3", + "Fire2", "Water1", "Water2", "Water3" @@ -86,7 +86,7 @@ void Draw() { { element = ClassifyDrawing(pngData, num++); playerAttack.HandleInput(element); - Debug.Log("Predictred class" + element + " with confidence" ); + Debug.Log("Predictred class" + element); } else { Debug.Log("Model is not assigned"); diff --git a/static_ml/etalon/dark1.png b/static_ml/etalon/dark1.png deleted file mode 100644 index 926233a8..00000000 Binary files a/static_ml/etalon/dark1.png and /dev/null differ diff --git a/static_ml/etalon/dark2.png b/static_ml/etalon/dark2.png deleted file mode 100644 index 45d8f2e1..00000000 Binary files a/static_ml/etalon/dark2.png and /dev/null differ diff --git a/static_ml/etalon/dark3.png b/static_ml/etalon/dark3.png deleted file mode 100644 index 5d5647f4..00000000 Binary files a/static_ml/etalon/dark3.png and /dev/null differ diff --git a/static_ml/etalon/fire2.png b/static_ml/etalon/fire2.png index 0331d6e9..a6b228f4 100644 Binary files a/static_ml/etalon/fire2.png and b/static_ml/etalon/fire2.png differ diff --git a/static_ml/etalon/fire3.png b/static_ml/etalon/fire3.png index a6b228f4..0331d6e9 100644 Binary files a/static_ml/etalon/fire3.png and b/static_ml/etalon/fire3.png differ diff --git a/static_ml/etalon/life1.png b/static_ml/etalon/life1.png deleted file mode 100644 index 49c1d511..00000000 Binary files a/static_ml/etalon/life1.png and /dev/null differ diff --git a/static_ml/etalon/life2.png b/static_ml/etalon/life2.png deleted file mode 100644 index 3f16efb9..00000000 Binary files a/static_ml/etalon/life2.png and /dev/null differ diff --git a/static_ml/etalon/life3.png b/static_ml/etalon/life3.png deleted file mode 100644 index 61af71b0..00000000 Binary files a/static_ml/etalon/life3.png and /dev/null differ diff --git a/static_ml/etalon/light1.png b/static_ml/etalon/light1.png deleted file mode 100644 index 8e85b2f9..00000000 Binary files a/static_ml/etalon/light1.png and /dev/null differ diff --git a/static_ml/etalon/light2.png b/static_ml/etalon/light2.png deleted file mode 100644 index 94f8b992..00000000 Binary files a/static_ml/etalon/light2.png and /dev/null differ diff --git a/static_ml/etalon/light3.png b/static_ml/etalon/light3.png deleted file mode 100644 index ba842a38..00000000 Binary files a/static_ml/etalon/light3.png and /dev/null differ diff --git a/static_ml/etalon/poison1.png b/static_ml/etalon/poison1.png deleted file mode 100644 index 8ea41d3f..00000000 Binary files a/static_ml/etalon/poison1.png and /dev/null differ diff --git a/static_ml/etalon/poison2.png b/static_ml/etalon/poison2.png deleted file mode 100644 index a6657b13..00000000 Binary files a/static_ml/etalon/poison2.png and /dev/null differ diff --git a/static_ml/etalon/poison3.png b/static_ml/etalon/poison3.png deleted file mode 100644 index 5cf4a5bb..00000000 Binary files a/static_ml/etalon/poison3.png and /dev/null differ diff --git a/static_ml/etalon/reflection1.png b/static_ml/etalon/reflection1.png deleted file mode 100644 index 8ddcd140..00000000 Binary files a/static_ml/etalon/reflection1.png and /dev/null differ diff --git a/static_ml/etalon/reflection2.png b/static_ml/etalon/reflection2.png deleted file mode 100644 index 3b415fd2..00000000 Binary files a/static_ml/etalon/reflection2.png and /dev/null differ diff --git a/static_ml/etalon/reflection3.png b/static_ml/etalon/reflection3.png deleted file mode 100644 index ee082a96..00000000 Binary files a/static_ml/etalon/reflection3.png and /dev/null differ