diff --git a/Assets/ResWork/UI_Image/Gacha/txt_0_gatcha.png b/Assets/ResWork/UI_Image/Gacha/txt_0_gatcha.png new file mode 100644 index 0000000..8b5c512 Binary files /dev/null and b/Assets/ResWork/UI_Image/Gacha/txt_0_gatcha.png differ diff --git a/Assets/ResWork/UI_Image/Gacha/txt_0_gatcha.png.meta b/Assets/ResWork/UI_Image/Gacha/txt_0_gatcha.png.meta new file mode 100644 index 0000000..83164c9 --- /dev/null +++ b/Assets/ResWork/UI_Image/Gacha/txt_0_gatcha.png.meta @@ -0,0 +1,155 @@ +fileFormatVersion: 2 +guid: 894d5b6d6901d8d4b82c463385e1f089 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7205315719240983681 + second: txt_0_gatcha_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 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: txt_0_gatcha_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 272 + height: 212 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f7b5a1c5783910c90800000000000000 + internalID: -7205315719240983681 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI_Image/Gacha/txt_6_gatcha.png b/Assets/ResWork/UI_Image/Gacha/txt_6_gatcha.png index e0e6712..8a41b83 100644 Binary files a/Assets/ResWork/UI_Image/Gacha/txt_6_gatcha.png and b/Assets/ResWork/UI_Image/Gacha/txt_6_gatcha.png differ diff --git a/Assets/ResWork/UI_Image/Gacha/txt_6_gatcha.png.meta b/Assets/ResWork/UI_Image/Gacha/txt_6_gatcha.png.meta index 88f03ab..8d2b78d 100644 --- a/Assets/ResWork/UI_Image/Gacha/txt_6_gatcha.png.meta +++ b/Assets/ResWork/UI_Image/Gacha/txt_6_gatcha.png.meta @@ -1,16 +1,10 @@ fileFormatVersion: 2 -guid: dbad168f19f6eab4cacef3fcd22936a9 +guid: cca58ce8317c07442993cdd01789a786 TextureImporter: internalIDToNameTable: - first: - 213: -2298984090934502163 - second: txt 6_gatcha_0 - - first: - 213: 2419407124857220687 - second: txt 6_gatcha_1 - - first: - 213: 3827629038828586352 - second: txt 6_gatcha_2 + 213: 5698226428560322799 + second: txt_6_gatcha_0 externalObjects: {} serializedVersion: 13 mipmaps: @@ -115,30 +109,17 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: - serializedVersion: 2 - name: txt 6_gatcha_0 + name: txt_6_gatcha_0 rect: serializedVersion: 2 x: 0 y: 0 - width: 741 - height: 249 + width: 416 + height: 244 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -147,52 +128,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: dec139b562e5810e0800000000000000 - internalID: -2298984090934502163 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: txt 6_gatcha_1 - rect: - serializedVersion: 2 - x: 727 - y: 111 - width: 70 - height: 155 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: f4ee92426f5739120800000000000000 - internalID: 2419407124857220687 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: txt 6_gatcha_2 - rect: - serializedVersion: 2 - x: 791 - y: 122 - width: 69 - height: 153 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 0750957c4587e1530800000000000000 - internalID: 3827629038828586352 + spriteID: fe0b41c0fba241f40800000000000000 + internalID: 5698226428560322799 vertices: [] indices: edges: [] @@ -210,10 +147,7 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: - txt 6_gatcha_0: -2298984090934502163 - txt 6_gatcha_1: 2419407124857220687 - txt 6_gatcha_2: 3827629038828586352 + nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/ResWork/UI_Image/Gacha/txt_7_gatcha.png b/Assets/ResWork/UI_Image/Gacha/txt_7_gatcha.png index 0812b18..e0e6712 100644 Binary files a/Assets/ResWork/UI_Image/Gacha/txt_7_gatcha.png and b/Assets/ResWork/UI_Image/Gacha/txt_7_gatcha.png differ diff --git a/Assets/ResWork/UI_Image/Gacha/txt_7_gatcha.png.meta b/Assets/ResWork/UI_Image/Gacha/txt_7_gatcha.png.meta index 8ca3224..88f03ab 100644 --- a/Assets/ResWork/UI_Image/Gacha/txt_7_gatcha.png.meta +++ b/Assets/ResWork/UI_Image/Gacha/txt_7_gatcha.png.meta @@ -1,16 +1,16 @@ fileFormatVersion: 2 -guid: 351637cbb0025d340ac1ee5aa02eaa4e +guid: dbad168f19f6eab4cacef3fcd22936a9 TextureImporter: internalIDToNameTable: - first: - 213: 143285463861401649 - second: txt 7_gatcha_0 + 213: -2298984090934502163 + second: txt 6_gatcha_0 - first: - 213: -5953423004054071905 - second: txt 7_gatcha_1 + 213: 2419407124857220687 + second: txt 6_gatcha_1 - first: - 213: -4942163911238832354 - second: txt 7_gatcha_2 + 213: 3827629038828586352 + second: txt 6_gatcha_2 externalObjects: {} serializedVersion: 13 mipmaps: @@ -115,17 +115,30 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: - serializedVersion: 2 - name: txt 7_gatcha_0 + name: txt 6_gatcha_0 rect: serializedVersion: 2 x: 0 y: 0 - width: 857 - height: 251 + width: 741 + height: 249 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -134,20 +147,20 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 1389fe6ce5d0df100800000000000000 - internalID: 143285463861401649 + spriteID: dec139b562e5810e0800000000000000 + internalID: -2298984090934502163 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: txt 7_gatcha_1 + name: txt 6_gatcha_1 rect: serializedVersion: 2 - x: 843 - y: 131 - width: 64 - height: 128 + x: 727 + y: 111 + width: 70 + height: 155 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -156,20 +169,20 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: f95d7b50251316da0800000000000000 - internalID: -5953423004054071905 + spriteID: f4ee92426f5739120800000000000000 + internalID: 2419407124857220687 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: txt 7_gatcha_2 + name: txt 6_gatcha_2 rect: serializedVersion: 2 - x: 892 - y: 143 - width: 26 - height: 123 + x: 791 + y: 122 + width: 69 + height: 153 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -178,8 +191,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: e1faad08b18e96bb0800000000000000 - internalID: -4942163911238832354 + spriteID: 0750957c4587e1530800000000000000 + internalID: 3827629038828586352 vertices: [] indices: edges: [] @@ -198,9 +211,9 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - txt 7_gatcha_0: 143285463861401649 - txt 7_gatcha_1: -5953423004054071905 - txt 7_gatcha_2: -4942163911238832354 + txt 6_gatcha_0: -2298984090934502163 + txt 6_gatcha_1: 2419407124857220687 + txt 6_gatcha_2: 3827629038828586352 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/ResWork/UI_Image/Gacha/txt_8_gatcha.png b/Assets/ResWork/UI_Image/Gacha/txt_8_gatcha.png new file mode 100644 index 0000000..0812b18 Binary files /dev/null and b/Assets/ResWork/UI_Image/Gacha/txt_8_gatcha.png differ diff --git a/Assets/ResWork/UI_Image/Gacha/txt_8_gatcha.png.meta b/Assets/ResWork/UI_Image/Gacha/txt_8_gatcha.png.meta new file mode 100644 index 0000000..8ca3224 --- /dev/null +++ b/Assets/ResWork/UI_Image/Gacha/txt_8_gatcha.png.meta @@ -0,0 +1,208 @@ +fileFormatVersion: 2 +guid: 351637cbb0025d340ac1ee5aa02eaa4e +TextureImporter: + internalIDToNameTable: + - first: + 213: 143285463861401649 + second: txt 7_gatcha_0 + - first: + 213: -5953423004054071905 + second: txt 7_gatcha_1 + - first: + 213: -4942163911238832354 + second: txt 7_gatcha_2 + 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: 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: txt 7_gatcha_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 857 + height: 251 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1389fe6ce5d0df100800000000000000 + internalID: 143285463861401649 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: txt 7_gatcha_1 + rect: + serializedVersion: 2 + x: 843 + y: 131 + width: 64 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f95d7b50251316da0800000000000000 + internalID: -5953423004054071905 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: txt 7_gatcha_2 + rect: + serializedVersion: 2 + x: 892 + y: 143 + width: 26 + height: 123 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e1faad08b18e96bb0800000000000000 + internalID: -4942163911238832354 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + txt 7_gatcha_0: 143285463861401649 + txt 7_gatcha_1: -5953423004054071905 + txt 7_gatcha_2: -4942163911238832354 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 854fe17..5729b22 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -10603,6 +10603,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 243431882} m_CullTransparentMesh: 1 +--- !u!1 &244691612 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 244691613} + - component: {fileID: 244691615} + - component: {fileID: 244691614} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &244691613 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244691612} + 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: 1610892171} + 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: 104} + m_SizeDelta: {x: 272, y: 212} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &244691614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244691612} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 894d5b6d6901d8d4b82c463385e1f089, type: 3} + 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!222 &244691615 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244691612} + m_CullTransparentMesh: 1 --- !u!1 &245119519 GameObject: m_ObjectHideFlags: 0 @@ -21829,6 +21904,7 @@ MonoBehaviour: fakeValue: 0 m_SelectMiniGameGirl: fakeValue: 0 + list_inapp: [] --- !u!114 &500962026 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31519,6 +31595,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727854121} m_CullTransparentMesh: 1 +--- !u!1 &732198337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 732198338} + - component: {fileID: 732198340} + - component: {fileID: 732198339} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &732198338 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732198337} + 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: 1108614964} + 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: 104} + m_SizeDelta: {x: 416, y: 244} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &732198339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732198337} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cca58ce8317c07442993cdd01789a786, type: 3} + 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!222 &732198340 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732198337} + m_CullTransparentMesh: 1 --- !u!1 &732615435 GameObject: m_ObjectHideFlags: 0 @@ -50351,6 +50502,42 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f64d4b082a41a9e42804e2ddfb768398, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1108614963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1108614964} + m_Layer: 5 + m_Name: Amazing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1108614964 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108614963} + 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: 732198338} + m_Father: {fileID: 1676803029} + 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: -342, y: 278} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1109820678 GameObject: m_ObjectHideFlags: 0 @@ -67724,41 +67911,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -42} m_SizeDelta: {x: 0, y: 194} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1533842731 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1533842732} - m_Layer: 5 - m_Name: Normal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1533842732 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1533842731} - 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: 1676803029} - 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: -342, y: 278} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1533851262 GameObject: m_ObjectHideFlags: 0 @@ -68066,7 +68218,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 3.289978, y: 158.83002} + m_AnchoredPosition: {x: 3.290039, y: 158.83002} m_SizeDelta: {x: -65.20001, y: -1066.1699} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1537928510 @@ -71496,6 +71648,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1606195922} m_CullTransparentMesh: 1 +--- !u!1 &1610892170 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1610892171} + m_Layer: 5 + m_Name: Worst + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1610892171 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1610892170} + 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: 244691613} + m_Father: {fileID: 1676803029} + 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: -342, y: 278} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1620551537 GameObject: m_ObjectHideFlags: 0 @@ -74429,12 +74617,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1610892171} - {fileID: 2144961650} - - {fileID: 1533842732} - {fileID: 949261339} - {fileID: 1827986432} - {fileID: 1292285444} - {fileID: 2043652659} + - {fileID: 1108614964} - {fileID: 1981426161} - {fileID: 2122254262} m_Father: {fileID: 1861711112} @@ -92924,12 +93113,13 @@ MonoBehaviour: m_Content: {fileID: 0} go_card: {fileID: 5880360140959969508, guid: b37f5080e9542a943b1834fc5d8549c9, type: 3} gos_grade: + - {fileID: 1610892170} - {fileID: 2144961649} - - {fileID: 1533842731} - {fileID: 949261338} - {fileID: 1827986431} - {fileID: 1292285443} - {fileID: 2043652658} + - {fileID: 1108614963} - {fileID: 1981426160} - {fileID: 2122254261} slider_lucky: @@ -96531,7 +96721,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 3.3397217, y: 158.83008} + m_AnchoredPosition: {x: 3.3398438, y: 158.83008} m_SizeDelta: {x: -65.101, y: -1066.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2093328781 diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 94bcb67..1d38fc1 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -57,8 +57,9 @@ public class GachaUI : uScrollViewMgr Set_Video(); m_GachaNeed = table_GlobalValue.Ins.Get_Int("GachaAmount"); + m_GachaNeed = SaveMgr.Ins.GachaChargeTime_Reduce() ? m_GachaNeed >> 1 : m_GachaNeed; m_GachaNeed.Obfuscate(); - texts[2].text = $"{(SaveMgr.Ins.GachaChargeTime_Reduce() ? m_GachaNeed >> 1 : m_GachaNeed)}"; + texts[2].text = m_GachaNeed.ToString(); } void Set_UI(bool updateSlider) @@ -289,14 +290,7 @@ public class GachaUI : uScrollViewMgr yield return new WaitForSeconds(0.5f); - switch (gradedata.n_GachaGrade) - { - case 1: case 2: gos_grade[0].SetActive(true); break; - case 3: break; - default: - DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 2); - break; - } + DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 1); CanSkip = isGacha = false; if (gradedata.n_GachaGrade == 9)