diff --git a/Assets/PerfectWorld/Prefab/UI/HUDNPC.prefab b/Assets/PerfectWorld/Prefab/UI/HUDNPC.prefab index 1c8b19cc4c..9a8af0fd20 100644 --- a/Assets/PerfectWorld/Prefab/UI/HUDNPC.prefab +++ b/Assets/PerfectWorld/Prefab/UI/HUDNPC.prefab @@ -273,7 +273,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ef86922851818c4e9e58040f51c491f, type: 3} + m_Sprite: {fileID: 21300000, guid: 6695fbf1b9d20d54fb3e13af31664790, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -350,8 +350,8 @@ MonoBehaviour: m_Calls: [] m_text: 100% m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -375,8 +375,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 23 + m_fontSizeBase: 23 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -453,8 +453,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: -1.6} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: -0.5261, y: -1.6} + m_SizeDelta: {x: 241.0417, y: 20.1006} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6237368962895350952 CanvasRenderer: @@ -486,8 +486,8 @@ MonoBehaviour: m_Calls: [] m_text: Chu tiem tap hoa m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -511,10 +511,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 23 + m_fontSize: 18 m_fontSizeBase: 23 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 1 @@ -622,8 +622,8 @@ MonoBehaviour: m_Calls: [] m_text: "Kh\xF4ng" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/PerfectWorld/UI/NPC/thanh mau npc 1.png b/Assets/PerfectWorld/UI/NPC/thanh mau npc 1.png new file mode 100644 index 0000000000..56fe416960 Binary files /dev/null and b/Assets/PerfectWorld/UI/NPC/thanh mau npc 1.png differ diff --git a/Assets/PerfectWorld/UI/NPC/thanh mau npc 1.png.meta b/Assets/PerfectWorld/UI/NPC/thanh mau npc 1.png.meta new file mode 100644 index 0000000000..f7c045a2e6 --- /dev/null +++ b/Assets/PerfectWorld/UI/NPC/thanh mau npc 1.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 6695fbf1b9d20d54fb3e13af31664790 +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: 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: thanh mau npc_0 + rect: + serializedVersion: 2 + x: 14 + y: 0 + width: 285 + height: 21 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 68735eb40acdf8f4f9c913c004f2318b + internalID: -637874507 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + thanh mau npc_0: -637874507 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PerfectWorld/UI/NPC/thanh mau npc.png.meta b/Assets/PerfectWorld/UI/NPC/thanh mau npc.png.meta index 5599bb2622..0dde386e30 100644 --- a/Assets/PerfectWorld/UI/NPC/thanh mau npc.png.meta +++ b/Assets/PerfectWorld/UI/NPC/thanh mau npc.png.meta @@ -43,13 +43,13 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + 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} + spriteBorder: {x: 17, y: 0, z: 17, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -108,13 +108,35 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: thanh mau npc_0 + rect: + serializedVersion: 2 + x: 14 + y: 0 + width: 285 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 68735eb40acdf8f4f9c913c004f2318b + internalID: -637874507 + vertices: [] + indices: + edges: [] + weights: [] outline: [] customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] @@ -122,7 +144,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + thanh mau npc_0: -637874507 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Prefabs/BoostrapForTest.prefab b/Assets/Prefabs/BoostrapForTest.prefab index baf1aefe7d..c1f056cc2b 100644 --- a/Assets/Prefabs/BoostrapForTest.prefab +++ b/Assets/Prefabs/BoostrapForTest.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &494527354240988833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 488350059091319944} + - component: {fileID: 8593071179722408578} + - component: {fileID: 921419674790977218} + m_Layer: 5 + m_Name: ImageSkill3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &488350059091319944 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494527354240988833} + 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: 5846576993284758716} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8593071179722408578 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494527354240988833} + m_CullTransparentMesh: 1 +--- !u!114 &921419674790977218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494527354240988833} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &695809075354249832 GameObject: m_ObjectHideFlags: 0 @@ -45,6 +120,370 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _nextSceneName: LoginScene +--- !u!1 &1919778866676473847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1142009100106113265} + - component: {fileID: 8065594275821516655} + - component: {fileID: 8504224074677298596} + - component: {fileID: 1151123696261167864} + m_Layer: 5 + m_Name: ImageBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1142009100106113265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919778866676473847} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1246341264222303661} + m_Father: {fileID: 2939659133088006666} + 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.3055, y: 0} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8065594275821516655 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919778866676473847} + m_CullTransparentMesh: 1 +--- !u!114 &8504224074677298596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919778866676473847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1151123696261167864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919778866676473847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &3493024708801173976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7142053399096767309} + - component: {fileID: 1276598646855116547} + - component: {fileID: 3189974089603112086} + - component: {fileID: 3458242582226058381} + - component: {fileID: 5797020864492755895} + m_Layer: 5 + m_Name: ButtonSkill3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7142053399096767309 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3493024708801173976} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5846576993284758716} + m_Father: {fileID: 33904160082820478} + 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: 525, y: 22} + m_SizeDelta: {x: 160, y: 155.1223} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1276598646855116547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3493024708801173976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67fd391520cbfd44f84a1c6bb57673c0, type: 3} + m_Name: + m_EditorClassIdentifier: + skillbutton: {fileID: 0} + skillImage: {fileID: 0} + cooldownTime: 0 +--- !u!222 &3189974089603112086 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3493024708801173976} + m_CullTransparentMesh: 1 +--- !u!114 &3458242582226058381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3493024708801173976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.16981131, g: 0.15619436, b: 0.15619436, a: 0.62352943} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5797020864492755895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3493024708801173976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3458242582226058381} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &3978987014378155233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2939659133088006666} + - component: {fileID: 7071724488663021237} + - component: {fileID: 445526918160676674} + - component: {fileID: 7095217816542363878} + - component: {fileID: 7456661863811740863} + m_Layer: 5 + m_Name: ButtonSkill2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2939659133088006666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3978987014378155233} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1142009100106113265} + m_Father: {fileID: 33904160082820478} + 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: 295, y: -131} + m_SizeDelta: {x: 160, y: 155.1223} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7071724488663021237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3978987014378155233} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67fd391520cbfd44f84a1c6bb57673c0, type: 3} + m_Name: + m_EditorClassIdentifier: + skillbutton: {fileID: 0} + skillImage: {fileID: 0} + cooldownTime: 0 +--- !u!222 &445526918160676674 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3978987014378155233} + m_CullTransparentMesh: 1 +--- !u!114 &7095217816542363878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3978987014378155233} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.16981131, g: 0.15619436, b: 0.15619436, a: 0.62352943} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7456661863811740863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3978987014378155233} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7095217816542363878} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4031863963514808284 GameObject: m_ObjectHideFlags: 0 @@ -79,6 +518,7 @@ Transform: - {fileID: 2466055582606182659} - {fileID: 1374891186888298875} - {fileID: 711777080245215489} + - {fileID: 7364935673883923056} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6961568406954853849 @@ -183,6 +623,171 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ddf01aaf66ec43f2bc9deda891a457d3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &8724842880287856420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5846576993284758716} + - component: {fileID: 6596731477737614961} + - component: {fileID: 3597798642197841968} + - component: {fileID: 2324668322655309914} + m_Layer: 5 + m_Name: ImageBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5846576993284758716 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8724842880287856420} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 488350059091319944} + m_Father: {fileID: 7142053399096767309} + 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.3055, y: 0} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6596731477737614961 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8724842880287856420} + m_CullTransparentMesh: 1 +--- !u!114 &3597798642197841968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8724842880287856420} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2324668322655309914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8724842880287856420} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &9142330036183254215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1246341264222303661} + - component: {fileID: 4384866183590606767} + - component: {fileID: 1308811555402040857} + m_Layer: 5 + m_Name: ImageSkill2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1246341264222303661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9142330036183254215} + 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: 1142009100106113265} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4384866183590606767 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9142330036183254215} + m_CullTransparentMesh: 1 +--- !u!114 &1308811555402040857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9142330036183254215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1001 &1374891186868484667 PrefabInstance: m_ObjectHideFlags: 0 @@ -517,6 +1122,163 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} m_PrefabInstance: {fileID: 1374891186868484667} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1597073214178286216 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8647913387955223815} + m_Modifications: + - target: {fileID: 5713000252331107611, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_Name + value: Canvas_Skill + objectReference: {fileID: 0} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_aSkillImage.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_aSkillButton.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: 'm_aSkillImage.Array.data[1]' + value: + objectReference: {fileID: 1308811555402040857} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: 'm_aSkillImage.Array.data[2]' + value: + objectReference: {fileID: 921419674790977218} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: 'm_aSkillButton.Array.data[1]' + value: + objectReference: {fileID: 7456661863811740863} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: 'm_aSkillButton.Array.data[2]' + value: + objectReference: {fileID: 5797020864492755895} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: AUIImagePictureList.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: 'AUIImagePictureList.Array.data[1]' + value: + objectReference: {fileID: 7071724488663021237} + - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: 'AUIImagePictureList.Array.data[2]' + value: + objectReference: {fileID: 1276598646855116547} + - target: {fileID: 7646065705685923996, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_AnchoredPosition.x + value: 264 + objectReference: {fileID: 0} + - target: {fileID: 7646065705685923996, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_AnchoredPosition.y + value: -387 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1608209508545832950, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + insertIndex: -1 + addedObject: {fileID: 2939659133088006666} + - targetCorrespondingSourceObject: {fileID: 1608209508545832950, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + insertIndex: -1 + addedObject: {fileID: 7142053399096767309} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} +--- !u!224 &33904160082820478 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1608209508545832950, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + m_PrefabInstance: {fileID: 1597073214178286216} + m_PrefabAsset: {fileID: 0} +--- !u!224 &7364935673883923056 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3} + m_PrefabInstance: {fileID: 1597073214178286216} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6181970391454287574 PrefabInstance: m_ObjectHideFlags: 0 @@ -525,10 +1287,184 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8647913387955223815} m_Modifications: + - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_text + value: 150K/150K + objectReference: {fileID: 0} + - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSize + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeMax + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeMin + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeBase + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} - target: {fileID: 1501462210578865223, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_LocalScale.x + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_LocalScale.y + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_LocalScale.z + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSize + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeMax + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeMin + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeBase + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} + - target: {fileID: 1822625665170167719, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 2.300003 + objectReference: {fileID: 0} + - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_text + value: '105 + +' + objectReference: {fileID: 0} + - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeMax + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeMin + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} + - target: {fileID: 4133230328392276113, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_Type + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4133230328392276113, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_FillMethod + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_SizeDelta.x + value: -20.6339 + objectReference: {fileID: 0} + - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchoredPosition.x + value: -2.8752 + objectReference: {fileID: 0} + - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_SizeDelta.x + value: -25.7078 + objectReference: {fileID: 0} + - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchoredPosition.x + value: -4.397293 + objectReference: {fileID: 0} - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} propertyPath: m_Pivot.x value: 0 @@ -609,6 +1545,90 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6716045574192280964, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_margin.z + value: 0.030044556 + objectReference: {fileID: 0} + - target: {fileID: 6716045574192280964, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + - target: {fileID: 6716045574192280964, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 13f71bf0225d0c0439db9931000d75d0, type: 2} + - target: {fileID: 6716045574192280964, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_VerticalAlignment + value: 4096 + objectReference: {fileID: 0} + - target: {fileID: 7023923657206919726, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_SizeDelta.x + value: 262.3562 + objectReference: {fileID: 0} + - target: {fileID: 7023923657206919726, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_SizeDelta.y + value: 25.9796 + objectReference: {fileID: 0} + - target: {fileID: 7023923657206919726, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 74.25657 + objectReference: {fileID: 0} + - target: {fileID: 7023923657206919726, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 28.228401 + objectReference: {fileID: 0} + - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_SizeDelta.x + value: -18.9426 + objectReference: {fileID: 0} + - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.0738983 + objectReference: {fileID: 0} + - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSize + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeMax + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeMin + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_fontSizeBase + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/Monster/MonsterPrefab.prefab b/Assets/Prefabs/Monster/MonsterPrefab.prefab index 149aa613eb..e78645cafe 100644 --- a/Assets/Prefabs/Monster/MonsterPrefab.prefab +++ b/Assets/Prefabs/Monster/MonsterPrefab.prefab @@ -67,8 +67,8 @@ MonoBehaviour: m_Calls: [] m_text: 100 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0.1 - m_fontSizeBase: 0.1 + m_fontSize: 0.15 + m_fontSizeBase: 0.15 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -265,7 +265,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5439308163421125551} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.07000001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -273,7 +273,7 @@ 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: 3.11} + m_AnchoredPosition: {x: -0.0000000060535967, y: 1.9189999} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2934704790758419263 @@ -306,15 +306,15 @@ MonoBehaviour: m_Calls: [] m_text: Hoang m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 13f71bf0225d0c0439db9931000d75d0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -433,14 +433,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ef86922851818c4e9e58040f51c491f, type: 3} + m_Sprite: {fileID: -637874507, guid: 9ef86922851818c4e9e58040f51c491f, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -476,7 +476,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6780952369966265306} serializedVersion: 2 - m_LocalRotation: {x: 0.017608283, y: 0.65204406, z: -0.015150423, w: 0.75782526} + m_LocalRotation: {x: 0.020765202, y: 0.6585355, z: -0.01818329, w: 0.7520433} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -653,7 +653,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7614570036441268122} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0.07} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -663,7 +663,7 @@ 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: 2.701} + m_AnchoredPosition: {x: -0, y: 1.51} m_SizeDelta: {x: 1, y: 0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7187889842481329847 @@ -687,7 +687,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5188679, g: 0.5066305, b: 0.5066305, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab index 76a4b96263..ccd6ea0b23 100644 --- a/Assets/Prefabs/Player/PlayerPrefab.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab.prefab @@ -26,7 +26,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519593321183147181} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.19} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -35,7 +35,7 @@ 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: 2.7} + m_AnchoredPosition: {x: -0, y: 2.54} m_SizeDelta: {x: 1, y: 0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &86199854622924504 @@ -283,8 +283,8 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6417286913550183034} - m_LocalRotation: {x: 0.15185507, y: -0.8631672, z: -0.37112242, w: 0.30683973} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.15189841, y: -0.86322004, z: -0.37099996, w: 0.30681783} + m_LocalPosition: {x: 0, y: 0, z: -0.19} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -292,7 +292,7 @@ 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: 3.11} + m_AnchoredPosition: {x: 0, y: 2.95} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4235828909678541546 @@ -485,6 +485,7 @@ MonoBehaviour: cid: 0 crc_c: 0 crc_e: 0 + _animationList: [] isHit: 0 id: 0 --- !u!1 &7854944069823046156 @@ -545,18 +546,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 4851800141835877220, guid: a141ce1b94af3cf46aa0695ab5ed6cdd, type: 3} - m_Type: 0 + m_Sprite: {fileID: -637874507, guid: 9ef86922851818c4e9e58040f51c491f, type: 3} + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 - m_FillMethod: 4 + m_FillMethod: 0 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 diff --git a/Assets/Prefabs/UI/InventoryUI.prefab b/Assets/Prefabs/UI/InventoryUI.prefab index 4693a4da1b..53f5596025 100644 --- a/Assets/Prefabs/UI/InventoryUI.prefab +++ b/Assets/Prefabs/UI/InventoryUI.prefab @@ -2355,15 +2355,15 @@ MonoBehaviour: m_Calls: [] m_text: Button m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -7441,8 +7441,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 8f24853d9cfea43389e8fb3101ffaae1, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9233,15 +9233,15 @@ MonoBehaviour: m_Calls: [] m_text: Button m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -11397,8 +11397,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 0e7885e3cd0cb72479e3e3361eed95ed, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Prefabs/UI/UIPlayer.prefab b/Assets/Prefabs/UI/UIPlayer.prefab index 89f061dc0a..0ba640ea1e 100644 --- a/Assets/Prefabs/UI/UIPlayer.prefab +++ b/Assets/Prefabs/UI/UIPlayer.prefab @@ -67,8 +67,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -163,7 +163,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 916552292620958145} - m_LocalRotation: {x: -0.002627404, y: 0.9181325, z: 0.3962182, w: 0.0060883234} + m_LocalRotation: {x: 0.15124027, y: 0.8467184, z: 0.39120576, w: -0.3273416} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -505,8 +505,8 @@ MonoBehaviour: m_Calls: [] m_text: Hoang m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Scenes/a61.unity b/Assets/Scenes/a61.unity index 24ae934a91..6a5f6e4942 100644 --- a/Assets/Scenes/a61.unity +++ b/Assets/Scenes/a61.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70397ae06d68958d5d7a8662bf0440549968d4af7c5dd3ca110e953d9dcc4576 -size 530559942 +oid sha256:f0243d83fdfe7a2a78abbfe7b558465227a6e0db4fe3a4423da913c12e505c7c +size 530552581 diff --git a/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock.mat b/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock.mat new file mode 100644 index 0000000000..73e290188e --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock.mat @@ -0,0 +1,111 @@ +%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: utm-cafeta SDF Material strock + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -8769018002762283618, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: 0.18 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 17 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0.414 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 0.9411765 + - _ScaleRatioB: 0.5952941 + - _ScaleRatioC: 0.5952941 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 1024 + - _TextureWidth: 4096 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock.mat.meta b/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock.mat.meta new file mode 100644 index 0000000000..16fa833fe4 --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31b77628c21b17e45a6577a3d3d5aef0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock_1.mat b/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock_1.mat new file mode 100644 index 0000000000..8cabb56f8e --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock_1.mat @@ -0,0 +1,111 @@ +%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: utm-cafeta SDF Material strock_1 + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -8769018002762283618, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 17 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0.257 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 0.9411765 + - _ScaleRatioB: 0.7647059 + - _ScaleRatioC: 0.7647059 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 1024 + - _TextureWidth: 4096 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock_1.mat.meta b/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock_1.mat.meta new file mode 100644 index 0000000000..c28fdef9e3 --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/utm-cafeta SDF Material strock_1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13f71bf0225d0c0439db9931000d75d0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: