diff --git a/Blacksmith/Assets/Pack/UI/StorePanel/63d8d18721af596f4b28e6a51edce53.png b/Blacksmith/Assets/Pack/UI/StorePanel/63d8d18721af596f4b28e6a51edce53.png new file mode 100644 index 00000000..c176c11e Binary files /dev/null and b/Blacksmith/Assets/Pack/UI/StorePanel/63d8d18721af596f4b28e6a51edce53.png differ diff --git a/Blacksmith/Assets/Pack/UI/StorePanel/63d8d18721af596f4b28e6a51edce53.png.meta b/Blacksmith/Assets/Pack/UI/StorePanel/63d8d18721af596f4b28e6a51edce53.png.meta new file mode 100644 index 00000000..09bab8a5 --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/StorePanel/63d8d18721af596f4b28e6a51edce53.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 707d6beacce492e45a19e524f2afa13e +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: 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: iPhone + 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/Blacksmith/Assets/Pack/UI/StorePanel/9e44dd2d8f7a623b1fda92ffc46f652.png b/Blacksmith/Assets/Pack/UI/StorePanel/9e44dd2d8f7a623b1fda92ffc46f652.png new file mode 100644 index 00000000..b56410a6 Binary files /dev/null and b/Blacksmith/Assets/Pack/UI/StorePanel/9e44dd2d8f7a623b1fda92ffc46f652.png differ diff --git a/Blacksmith/Assets/Pack/UI/StorePanel/9e44dd2d8f7a623b1fda92ffc46f652.png.meta b/Blacksmith/Assets/Pack/UI/StorePanel/9e44dd2d8f7a623b1fda92ffc46f652.png.meta new file mode 100644 index 00000000..88a7b3e6 --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/StorePanel/9e44dd2d8f7a623b1fda92ffc46f652.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 4d166fd2b8a72264093c7bd13e0a150c +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: 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: iPhone + 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/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.atlas.txt b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.atlas.txt new file mode 100644 index 00000000..aab56b65 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.atlas.txt @@ -0,0 +1,125 @@ +spine_141_01.png + size: 512, 512 + filter: Linear, Linear +01cb1 + bounds: 301, 300, 46, 71 + rotate: 90 +01cb2 + bounds: 65, 338, 62, 69 + rotate: 90 +01eye + bounds: 439, 300, 50, 21 +01eyeB + bounds: 2, 502, 49, 8 + offsets: 0, 1, 49, 11 +01eyeG + bounds: 457, 493, 49, 17 +01mm + bounds: 360, 499, 28, 11 +01s1 + bounds: 102, 456, 21, 12 +01s2 + bounds: 108, 388, 19, 12 + offsets: 0, 3, 21, 15 +01shadow + bounds: 436, 389, 31, 11 +01st + bounds: 92, 469, 33, 31 +01t + bounds: 211, 436, 85, 74 +02cb1 + bounds: 234, 369, 61, 71 +02cb2 + bounds: 246, 314, 30, 76 + rotate: 90 +02cb3 + bounds: 2, 358, 73, 80 + rotate: 180 +02cb4 + bounds: 259, 346, 48, 76 + rotate: 90 +02eye + bounds: 181, 299, 42, 17 +02eyeB + bounds: 53, 504, 40, 6 + offsets: 0, 1, 41, 9 +02eyeG + bounds: 496, 332, 42, 14 + rotate: 90 +02mm + bounds: 2, 438, 17, 9 +02s1 + bounds: 244, 342, 26, 16 + offsets: 0, 0, 29, 16 +02s2 + bounds: 42, 432, 22, 15 + offsets: 0, 0, 22, 16 +02st + bounds: 344, 342, 53, 50 + rotate: 90 +02t + bounds: 391, 438, 72, 64 + offsets: 0, 0, 74, 64 + rotate: 90 +02tui + bounds: 189, 318, 49, 55 + rotate: 90 +03bianzi + bounds: 396, 356, 55, 106 + offsets: 2, 0, 57, 106 + rotate: 270 +03bozi + bounds: 85, 307, 58, 24 + offsets: 0, 0, 58, 25 +03cb1 + bounds: 132, 312, 51, 51 + rotate: 90 +03cb11 + bounds: 136, 358, 33, 75 + rotate: 90 +03cb1_Z + bounds: 2, 449, 51, 98 + rotate: 90 +03cb2 + bounds: 2, 334, 61, 49 + offsets: 0, 0, 61, 51 + rotate: 180 +03cb22 + bounds: 64, 402, 50, 82 + rotate: 90 +03cb3 + bounds: 395, 301, 55, 43 + rotate: 270 +03cb33 + bounds: 148, 393, 42, 81 + rotate: 90 +03cb3_Z + bounds: 421, 402, 89, 88 + rotate: 180 +03cb4 + bounds: 417, 323, 39, 76 + rotate: 90 +03cb44 + bounds: 4, 314, 33, 83 + rotate: 90 +03cb4_Z + bounds: 294, 384, 71, 95 + rotate: 90 +03eye + bounds: 374, 301, 39, 18 + rotate: 90 +03eyeB + bounds: 95, 502, 35, 8 +03eyeG + bounds: 297, 417, 39, 16 +03s1 + bounds: 457, 461, 30, 20 + rotate: 90 +03s2 + bounds: 391, 418, 26, 18 + offsets: 2, 0, 28, 18 +03st + bounds: 294, 435, 75, 95 + rotate: 270 +03t + bounds: 132, 445, 77, 65 diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.atlas.txt.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.atlas.txt.meta new file mode 100644 index 00000000..71345ccd --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e1ee2529ba37e30409ac40a5d455fbb7 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.png b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.png new file mode 100644 index 00000000..98a05841 Binary files /dev/null and b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.png differ diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.png.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.png.meta new file mode 100644 index 00000000..26641c37 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 0befd6419323b3b4fb20f815147685a5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + 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: 0 + 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: 0 + 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: 0 + 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: iPhone + 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/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.skel.bytes b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.skel.bytes new file mode 100644 index 00000000..877b13cc Binary files /dev/null and b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.skel.bytes differ diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.skel.bytes.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.skel.bytes.meta new file mode 100644 index 00000000..3bcf19b4 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1dfdd1d77e9d3141b64355cd22d5ef8 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Atlas.asset b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Atlas.asset new file mode 100644 index 00000000..0ced9d9e --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Atlas.asset @@ -0,0 +1,19 @@ +%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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: spine_141_01_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: e1ee2529ba37e30409ac40a5d455fbb7, type: 3} + materials: + - {fileID: 2100000, guid: 736f8d1dd74820940910bb6473bf454d, type: 2} diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Atlas.asset.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Atlas.asset.meta new file mode 100644 index 00000000..ca342090 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbacacad126a8d94bbf0e7dcc018571a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Material.mat b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Material.mat new file mode 100644 index 00000000..17adac8f --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Material.mat @@ -0,0 +1,47 @@ +%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: spine_141_01_Material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 0befd6419323b3b4fb20f815147685a5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Material.mat.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Material.mat.meta new file mode 100644 index 00000000..102cedd6 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 736f8d1dd74820940910bb6473bf454d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_SkeletonData.asset b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_SkeletonData.asset new file mode 100644 index 00000000..4c80a3c3 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_SkeletonData.asset @@ -0,0 +1,31 @@ +%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: spine_141_01_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: dbacacad126a8d94bbf0e7dcc018571a, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: d1dfdd1d77e9d3141b64355cd22d5ef8, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_SkeletonData.asset.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_SkeletonData.asset.meta new file mode 100644 index 00000000..e75eab71 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_01_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3df3bedffd6af1e44abea9bfc8590d97 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_02.skel.bytes b/Blacksmith/Assets/Pack/spine/Monster/spine_141_02.skel.bytes new file mode 100644 index 00000000..d7efa8b8 Binary files /dev/null and b/Blacksmith/Assets/Pack/spine/Monster/spine_141_02.skel.bytes differ diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_02.skel.bytes.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_02.skel.bytes.meta new file mode 100644 index 00000000..ec74d3b7 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_02.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8ccc87627f6f4a34da396ca7e62f411e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_02_SkeletonData.asset b/Blacksmith/Assets/Pack/spine/Monster/spine_141_02_SkeletonData.asset new file mode 100644 index 00000000..de57502b --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_02_SkeletonData.asset @@ -0,0 +1,31 @@ +%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: spine_141_02_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: dbacacad126a8d94bbf0e7dcc018571a, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 8ccc87627f6f4a34da396ca7e62f411e, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_02_SkeletonData.asset.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_02_SkeletonData.asset.meta new file mode 100644 index 00000000..72fa3b07 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_02_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e85eec2c9b479eb48a194b5a0e3cd3de +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_03.skel.bytes b/Blacksmith/Assets/Pack/spine/Monster/spine_141_03.skel.bytes new file mode 100644 index 00000000..47eb2493 Binary files /dev/null and b/Blacksmith/Assets/Pack/spine/Monster/spine_141_03.skel.bytes differ diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_03.skel.bytes.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_03.skel.bytes.meta new file mode 100644 index 00000000..aa7df4dd --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_03.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a332a65b99bd2fb4eb23b33b4a2a3828 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_03_SkeletonData.asset b/Blacksmith/Assets/Pack/spine/Monster/spine_141_03_SkeletonData.asset new file mode 100644 index 00000000..ce262431 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_03_SkeletonData.asset @@ -0,0 +1,31 @@ +%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: spine_141_03_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: dbacacad126a8d94bbf0e7dcc018571a, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: a332a65b99bd2fb4eb23b33b4a2a3828, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Blacksmith/Assets/Pack/spine/Monster/spine_141_03_SkeletonData.asset.meta b/Blacksmith/Assets/Pack/spine/Monster/spine_141_03_SkeletonData.asset.meta new file mode 100644 index 00000000..024ae9f2 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Monster/spine_141_03_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 528ddab8903a5a34f9fdbf8973caf4d7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Resources/Data/blacksmithdata_item.json b/Blacksmith/Assets/Resources/Data/blacksmithdata_item.json index 24a30c2d..2d5bcdf9 100644 --- a/Blacksmith/Assets/Resources/Data/blacksmithdata_item.json +++ b/Blacksmith/Assets/Resources/Data/blacksmithdata_item.json @@ -161,7 +161,7 @@ "Includearms": 0, "Proptype": 1, "Propquality": 4, - "Icon": "cichou", + "Icon": "sichou", "Propdescription": 0, "Forgingprogress": 20, "Forgingprogressda": 2000, diff --git a/Blacksmith/Assets/Resources/Data/blacksmithdata_weapon.json b/Blacksmith/Assets/Resources/Data/blacksmithdata_weapon.json index 3ee561b9..d1bbde67 100644 --- a/Blacksmith/Assets/Resources/Data/blacksmithdata_weapon.json +++ b/Blacksmith/Assets/Resources/Data/blacksmithdata_weapon.json @@ -50,7 +50,7 @@ "Attack": 12, "HP": 100, "Attackskill": 0, - "Icon": "changbing", + "Icon": "changbinglei", "Describe": "" }, { diff --git a/Blacksmith/Assets/Resources/Prefab/Mouster/BigBirdMonster.prefab b/Blacksmith/Assets/Resources/Prefab/Mouster/BigBirdMonster.prefab new file mode 100644 index 00000000..ad18e75a --- /dev/null +++ b/Blacksmith/Assets/Resources/Prefab/Mouster/BigBirdMonster.prefab @@ -0,0 +1,302 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4177370848473932766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5537344553321071934} + - component: {fileID: 731921618462809821} + - component: {fileID: 1151588281664711620} + - component: {fileID: 8167203040827974690} + - component: {fileID: 5044662577549088348} + m_Layer: 0 + m_Name: BigBirdMonster + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5537344553321071934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4.989729, y: 5.6061068, z: 9.530382} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7864819560886314639} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &731921618462809821 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: 0d34a5f712ab6aa4f86be9a19b4b90ff, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1151588281664711620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9201f5188da6267409bdf485d55967c4, type: 3} + m_Name: + m_EditorClassIdentifier: + lockTra: {fileID: 0} + attack: 0 + hitPoints: 0 + strength: 0 + dexterity: 0 + criticalStrike: 0 + entity: + hp: 0 + injured: 0 + cd: 0 + nextAttack: 0 +--- !u!58 &8167203040827974690 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!50 &5044662577549088348 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 7 +--- !u!1 &4847834477446878042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7864819560886314639} + - component: {fileID: 6998614918651353677} + - component: {fileID: 8613300829054881624} + - component: {fileID: 7114813951918817151} + m_Layer: 0 + m_Name: Spine GameObject (spine_101_01) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7864819560886314639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 43} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5537344553321071934} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6998614918651353677 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Mesh: {fileID: 0} +--- !u!23 &8613300829054881624 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ebbb863bc9beab34aa61c802606958a1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &7114813951918817151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: d569aed5656221d49b22abbadb496707, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: run + loop: 1 + timeScale: 1 diff --git a/Blacksmith/Assets/Resources/Prefab/Mouster/BigBirdMonster.prefab.meta b/Blacksmith/Assets/Resources/Prefab/Mouster/BigBirdMonster.prefab.meta new file mode 100644 index 00000000..b7951845 --- /dev/null +++ b/Blacksmith/Assets/Resources/Prefab/Mouster/BigBirdMonster.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3ffcd21666d7b924ba2bb2233ba406a1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Resources/Prefab/Mouster/MediumBirdMonster.prefab b/Blacksmith/Assets/Resources/Prefab/Mouster/MediumBirdMonster.prefab new file mode 100644 index 00000000..eb9b158a --- /dev/null +++ b/Blacksmith/Assets/Resources/Prefab/Mouster/MediumBirdMonster.prefab @@ -0,0 +1,302 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4177370848473932766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5537344553321071934} + - component: {fileID: 731921618462809821} + - component: {fileID: 1151588281664711620} + - component: {fileID: 8167203040827974690} + - component: {fileID: 5044662577549088348} + m_Layer: 0 + m_Name: MediumBirdMonster + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5537344553321071934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4.989729, y: 5.6061068, z: 9.530382} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7864819560886314639} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &731921618462809821 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: 0d34a5f712ab6aa4f86be9a19b4b90ff, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1151588281664711620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9201f5188da6267409bdf485d55967c4, type: 3} + m_Name: + m_EditorClassIdentifier: + lockTra: {fileID: 0} + attack: 0 + hitPoints: 0 + strength: 0 + dexterity: 0 + criticalStrike: 0 + entity: + hp: 0 + injured: 0 + cd: 0 + nextAttack: 0 +--- !u!58 &8167203040827974690 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!50 &5044662577549088348 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 7 +--- !u!1 &4847834477446878042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7864819560886314639} + - component: {fileID: 6998614918651353677} + - component: {fileID: 8613300829054881624} + - component: {fileID: 7114813951918817151} + m_Layer: 0 + m_Name: Spine GameObject (spine_101_01) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7864819560886314639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 43} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5537344553321071934} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6998614918651353677 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Mesh: {fileID: 0} +--- !u!23 &8613300829054881624 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 736f8d1dd74820940910bb6473bf454d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &7114813951918817151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 528ddab8903a5a34f9fdbf8973caf4d7, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: run + loop: 1 + timeScale: 1 diff --git a/Blacksmith/Assets/Resources/Prefab/Mouster/MediumBirdMonster.prefab.meta b/Blacksmith/Assets/Resources/Prefab/Mouster/MediumBirdMonster.prefab.meta new file mode 100644 index 00000000..4a89ca5b --- /dev/null +++ b/Blacksmith/Assets/Resources/Prefab/Mouster/MediumBirdMonster.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c82d4352382a073488d8dcbb7016fe02 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Resources/Prefab/Mouster/SmallBirdMonster.prefab b/Blacksmith/Assets/Resources/Prefab/Mouster/SmallBirdMonster.prefab new file mode 100644 index 00000000..577d00e8 --- /dev/null +++ b/Blacksmith/Assets/Resources/Prefab/Mouster/SmallBirdMonster.prefab @@ -0,0 +1,302 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4177370848473932766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5537344553321071934} + - component: {fileID: 731921618462809821} + - component: {fileID: 1151588281664711620} + - component: {fileID: 8167203040827974690} + - component: {fileID: 5044662577549088348} + m_Layer: 0 + m_Name: SmallBirdMonster + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5537344553321071934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4.989729, y: 5.6061068, z: 9.530382} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7864819560886314639} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &731921618462809821 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: 0d34a5f712ab6aa4f86be9a19b4b90ff, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1151588281664711620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9201f5188da6267409bdf485d55967c4, type: 3} + m_Name: + m_EditorClassIdentifier: + lockTra: {fileID: 0} + attack: 0 + hitPoints: 0 + strength: 0 + dexterity: 0 + criticalStrike: 0 + entity: + hp: 0 + injured: 0 + cd: 0 + nextAttack: 0 +--- !u!58 &8167203040827974690 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!50 &5044662577549088348 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177370848473932766} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 7 +--- !u!1 &4847834477446878042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7864819560886314639} + - component: {fileID: 6998614918651353677} + - component: {fileID: 8613300829054881624} + - component: {fileID: 7114813951918817151} + m_Layer: 0 + m_Name: Spine GameObject (spine_101_01) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7864819560886314639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 43} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5537344553321071934} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6998614918651353677 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Mesh: {fileID: 0} +--- !u!23 &8613300829054881624 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7bf8d8ce1febf684dac542356d545ca6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &7114813951918817151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847834477446878042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 3df3bedffd6af1e44abea9bfc8590d97, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: run + loop: 1 + timeScale: 1 diff --git a/Blacksmith/Assets/Resources/Prefab/Mouster/SmallBirdMonster.prefab.meta b/Blacksmith/Assets/Resources/Prefab/Mouster/SmallBirdMonster.prefab.meta new file mode 100644 index 00000000..86798d62 --- /dev/null +++ b/Blacksmith/Assets/Resources/Prefab/Mouster/SmallBirdMonster.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b6786be220324d6408e82e0088a70b62 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Scenes/SampleScene.unity b/Blacksmith/Assets/Scenes/SampleScene.unity index 38ad1038..81b61a15 100644 --- a/Blacksmith/Assets/Scenes/SampleScene.unity +++ b/Blacksmith/Assets/Scenes/SampleScene.unity @@ -4389,7 +4389,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 125} - m_SizeDelta: {x: 350.3372, y: 369.2015} + m_SizeDelta: {x: 378, y: 299} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &178547695 MonoBehaviour: @@ -4411,7 +4411,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 633561933a3eca54d8223a7324160660, type: 3} + m_Sprite: {fileID: 21300000, guid: 4d166fd2b8a72264093c7bd13e0a150c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7074,7 +7074,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u6750\u6599\u7BB1\u5B50" --- !u!222 &263952712 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8645,7 +8645,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u6B66\u5668\u7BB1\u5B50" --- !u!222 &342325168 CanvasRenderer: m_ObjectHideFlags: 0 @@ -18060,7 +18060,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u968F\u673A\u7BB1\u5B50" --- !u!222 &673714450 CanvasRenderer: m_ObjectHideFlags: 0 @@ -19728,7 +19728,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u953B\u9020\u4E66\u7BB1\u5B50" --- !u!222 &751101125 CanvasRenderer: m_ObjectHideFlags: 0 @@ -30580,8 +30580,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 125} - m_SizeDelta: {x: 350.3372, y: 369.2015} + m_AnchoredPosition: {x: 0, y: 103} + m_SizeDelta: {x: 338.17, y: 291.8521} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1134267699 MonoBehaviour: @@ -30603,7 +30603,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 633561933a3eca54d8223a7324160660, type: 3} + m_Sprite: {fileID: 21300000, guid: 707d6beacce492e45a19e524f2afa13e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -31633,7 +31633,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 125} - m_SizeDelta: {x: 350.3372, y: 369.2015} + m_SizeDelta: {x: 230, y: 253} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1203125878 MonoBehaviour: @@ -31655,7 +31655,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 633561933a3eca54d8223a7324160660, type: 3} + m_Sprite: {fileID: 21300000, guid: 19e165c96c1dd274789c5c586eebcb39, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Blacksmith/Assets/Script/Battle/Mouster/Mouster.cs b/Blacksmith/Assets/Script/Battle/Mouster/Mouster.cs index d4599d56..ba329ed0 100644 --- a/Blacksmith/Assets/Script/Battle/Mouster/Mouster.cs +++ b/Blacksmith/Assets/Script/Battle/Mouster/Mouster.cs @@ -85,3 +85,10 @@ public class Mouster : MonoBehaviour } } + +enum MonsterState +{ + move, + idel, + attack +} diff --git a/Blacksmith/Assets/Script/UI/DrawingPanel.cs b/Blacksmith/Assets/Script/UI/DrawingPanel.cs index d094d673..b7b3946a 100644 --- a/Blacksmith/Assets/Script/UI/DrawingPanel.cs +++ b/Blacksmith/Assets/Script/UI/DrawingPanel.cs @@ -88,6 +88,7 @@ public class DrawingPanel : MonoBehaviour wData = JsonTab.Instance.attributeData(data.ID, le); var datas=JsonTab.Instance.Attribute[data.ID]; var skillList = new List(); + icon.sprite = AssetBundleManager.ins.Sprite(data.Icon, AtlasType.DrawingIcon); foreach (var v in datas) { if (v.Value.Getskill!=0) diff --git a/Blacksmith/MiniTemplate/Datas/道具表.xlsx b/Blacksmith/MiniTemplate/Datas/道具表.xlsx index 8f277679..2bdd7896 100644 Binary files a/Blacksmith/MiniTemplate/Datas/道具表.xlsx and b/Blacksmith/MiniTemplate/Datas/道具表.xlsx differ diff --git a/box1/TextToolDatas/slim/backup.txt b/box1/TextToolDatas/slim/backup.txt index 2008082d..316fecda 100644 Binary files a/box1/TextToolDatas/slim/backup.txt and b/box1/TextToolDatas/slim/backup.txt differ