diff --git a/Assets/ResWork/UI_Image/OtherGame/Icon_GoStop.png b/Assets/ResWork/UI_Image/OtherGame/Icon_GoStop.png deleted file mode 100644 index 7f2e749..0000000 Binary files a/Assets/ResWork/UI_Image/OtherGame/Icon_GoStop.png and /dev/null differ diff --git a/Assets/ResWork/UI_Image/OtherGame/gamegoicon.png b/Assets/ResWork/UI_Image/OtherGame/gamegoicon.png new file mode 100644 index 0000000..ebbf97c Binary files /dev/null and b/Assets/ResWork/UI_Image/OtherGame/gamegoicon.png differ diff --git a/Assets/ResWork/UI_Image/OtherGame/gamegoicon.png.meta b/Assets/ResWork/UI_Image/OtherGame/gamegoicon.png.meta new file mode 100644 index 0000000..b20beba --- /dev/null +++ b/Assets/ResWork/UI_Image/OtherGame/gamegoicon.png.meta @@ -0,0 +1,155 @@ +fileFormatVersion: 2 +guid: fdcf68b4a79fce24d926495c96468c45 +TextureImporter: + internalIDToNameTable: + - first: + 213: 5987443977316100727 + second: gamegoicon_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: gamegoicon_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 77a6a74139ca71350800000000000000 + internalID: 5987443977316100727 + 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/OtherGame/yageunicon.png b/Assets/ResWork/UI_Image/OtherGame/yageunicon.png new file mode 100644 index 0000000..da844ef Binary files /dev/null and b/Assets/ResWork/UI_Image/OtherGame/yageunicon.png differ diff --git a/Assets/ResWork/UI_Image/OtherGame/Icon_GoStop.png.meta b/Assets/ResWork/UI_Image/OtherGame/yageunicon.png.meta similarity index 93% rename from Assets/ResWork/UI_Image/OtherGame/Icon_GoStop.png.meta rename to Assets/ResWork/UI_Image/OtherGame/yageunicon.png.meta index 65394b1..b93bd97 100644 --- a/Assets/ResWork/UI_Image/OtherGame/Icon_GoStop.png.meta +++ b/Assets/ResWork/UI_Image/OtherGame/yageunicon.png.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 094efa3ba7bc49540a8db7f32123b476 +guid: 245ee09021efd684088ba2f940fd61ba TextureImporter: internalIDToNameTable: - first: - 213: 9009113278126648406 - second: Icon512_0 + 213: -7643347828759445232 + second: yageunicon_0 externalObjects: {} serializedVersion: 13 mipmaps: @@ -113,7 +113,7 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: Icon512_0 + name: yageunicon_0 rect: serializedVersion: 2 x: 0 @@ -128,8 +128,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 65c6efb4bccc60d70800000000000000 - internalID: 9009113278126648406 + spriteID: 0114a0c55af5de590800000000000000 + internalID: -7643347828759445232 vertices: [] indices: edges: [] @@ -148,7 +148,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - Icon512_0: 9009113278126648406 + yageunicon_0: -7643347828759445232 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 5ef21df..ad3ddb8 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2784,7 +2784,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 2756, y: -25} + m_AnchoredPosition: {x: 2756, y: -25.000015} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &85415561 @@ -15699,7 +15699,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -2756, y: -25} + m_AnchoredPosition: {x: -2756, y: -25.000015} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &420248622 @@ -50944,6 +50944,153 @@ RectTransform: m_AnchoredPosition: {x: 708.62305, y: -301.85} m_SizeDelta: {x: 1080, y: 491.7} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1370974287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1370974288} + - component: {fileID: 1370974292} + - component: {fileID: 1370974291} + - component: {fileID: 1370974290} + - component: {fileID: 1370974289} + m_Layer: 5 + m_Name: btn_1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1370974288 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370974287} + 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: 1870441981} + m_Father: {fileID: 1873956282} + 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: 125, y: -16.04} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1370974289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370974287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Sound: 0 +--- !u!114 &1370974290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370974287} + 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: 1370974291} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2034573240} + m_TargetAssemblyTypeName: OptionUI, Assembly-CSharp + m_MethodName: OnClick_OtherGame + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: https://m.onestore.co.kr/v2/ko-kr/app/0000779721 + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1370974291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370974287} + 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: 21300000, guid: fdcf68b4a79fce24d926495c96468c45, 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 &1370974292 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370974287} + m_CullTransparentMesh: 1 --- !u!1001 &1371982221 PrefabInstance: m_ObjectHideFlags: 0 @@ -60507,7 +60654,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: 0, y: -55.772705} + m_AnchoredPosition: {x: 0, y: -55.77272} m_SizeDelta: {x: 0, y: -111.5455} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1630921640 @@ -62909,7 +63056,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: -2.93, y: -16.04} + m_AnchoredPosition: {x: -125, y: -16.04} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1695390285 @@ -62971,14 +63118,14 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 2034573240} m_TargetAssemblyTypeName: OptionUI, Assembly-CSharp - m_MethodName: OnClick_Game - m_Mode: 3 + m_MethodName: OnClick_OtherGame + m_Mode: 5 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: https://m.onestore.co.kr/v2/ko-kr/app/0001000295 m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1695390287 @@ -63001,7 +63148,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 094efa3ba7bc49540a8db7f32123b476, type: 3} + m_Sprite: {fileID: 21300000, guid: 245ee09021efd684088ba2f940fd61ba, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -66240,7 +66387,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uB79C\uB364 \uC5EC\uCE5C \uB9DE\uACE0" + m_text: "\uC57C\uADFC\uD55C \uADF8\uB140" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} @@ -69632,6 +69779,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1870441980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1870441981} + - component: {fileID: 1870441983} + - component: {fileID: 1870441982} + m_Layer: 5 + m_Name: New TMP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1870441981 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870441980} + 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: 1370974288} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -23.61} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1870441982 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870441980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uB9CC\uC838\uBC14\uB77CGo" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} + m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4293256191 + m_fontColor: {r: 1, g: 0.8901961, b: 0.8980392, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 25 + m_fontSizeMax: 100 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -10 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1870441983 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870441980} + m_CullTransparentMesh: 1 --- !u!1 &1871139626 GameObject: m_ObjectHideFlags: 0 @@ -69914,6 +70197,7 @@ RectTransform: m_Children: - {fileID: 1678358371} - {fileID: 1695390284} + - {fileID: 1370974288} m_Father: {fileID: 770900677} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -72682,7 +72966,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -25} + m_AnchoredPosition: {x: 0, y: -25.000015} m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1950932325 diff --git a/Assets/Scripts/Chat/ChatUI.cs b/Assets/Scripts/Chat/ChatUI.cs index dbb4518..f13733b 100644 --- a/Assets/Scripts/Chat/ChatUI.cs +++ b/Assets/Scripts/Chat/ChatUI.cs @@ -34,7 +34,7 @@ public class ChatUI : MonoBehaviour var chatdata = SaveMgr.Ins.Get_ChatSaveData_orNull(m_Data.n_GirlID); if (chatdata != null) for (int i = 0; i < chatdata.histories.Count; i++) - Set_Chat(chatdata.histories[i]); + Set_Chat(chatdata.histories[i], i == chatdata.histories.Count - 1); else Make_Today(); } @@ -46,11 +46,14 @@ public class ChatUI : MonoBehaviour ADInfo.Ins.Set_Banner(true); } - void Set_Chat(ChatHistory chat) + void Set_Chat(ChatHistory chat, bool maketoday) { - DateTime dt = DateTime.Parse(chat.timestamp); - if (dt.Day != InternetTime.Ins.Time.Day) - Make_Today(); + if (maketoday) + { + DateTime dt = DateTime.Parse(chat.timestamp); + if (dt.Day != InternetTime.Ins.Time.Day) + Make_Today(); + } if (chat.role.Equals("assistant")) { @@ -114,7 +117,7 @@ public class ChatUI : MonoBehaviour }; // 내 히스토리 추가 SaveMgr.Ins.Add_ChatData(m_Data.n_GirlID, "", myhistory); - Set_Chat(myhistory); + Set_Chat(myhistory, false); using (UnityWebRequest www = new UnityWebRequest(chaturl, "POST")) { @@ -143,7 +146,7 @@ public class ChatUI : MonoBehaviour // 걸 히스토리 추가 SaveMgr.Ins.Add_ChatData(m_Data.n_GirlID, data.conversationId, girlchathistory); - Set_Chat(girlchathistory); + Set_Chat(girlchathistory, true); } else { diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index b96a58b..167a640 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -262,12 +262,14 @@ public class GachaUI : uScrollViewMgr if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTime -= fRefillTime * 0.9f; GachaAutoRefillTime = InternetTime.Ins.Time.AddSeconds(fRefillTime); - yield return new WaitForSeconds(0.5f); - DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 1); if (gradedata.n_GachaGrade <= 2) gos_effect[1].SetActive(true); else if (gradedata.n_GachaGrade <= 4) gos_effect[2].SetActive(true); else if (gradedata.n_GachaGrade <= 6) gos_effect[3].SetActive(true); else gos_effect[4].SetActive(true); + + yield return new WaitForSeconds(0.5f); + + DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 1); isGacha = false; } diff --git a/Assets/Scripts/UI/OptionUI.cs b/Assets/Scripts/UI/OptionUI.cs index 3694c7f..7d1f687 100644 --- a/Assets/Scripts/UI/OptionUI.cs +++ b/Assets/Scripts/UI/OptionUI.cs @@ -29,15 +29,8 @@ public class OptionUI : MonoBehaviour } } - public void OnClick_Game(int index) + public void OnClick_OtherGame(string url) { - switch (index) - { - case 0: - // 원스토어 - // 구글 - Application.OpenURL("market://details?id=com.fgb.randomgfgostop"); - break; - } + Application.OpenURL(url); } } \ No newline at end of file