미션 클리어 표시

2025-09-18 13:37:50 +09:00 · 2025-09-18 13:37:50 +09:00 · 1dbb1fce7f
parent d592571b25
commit 1dbb1fce7f
9 changed files with 327 additions and 4 deletions
--- a/Assets/Resources/Prefabs/Popups/MissionOpenPopup.prefab
+++ b/Assets/Resources/Prefabs/Popups/MissionOpenPopup.prefab
@ -77,6 +77,81 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &596442702802913212
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5884705281673483543}
+  - component: {fileID: 5553460609119447545}
+  - component: {fileID: 2665067982719249232}
+  m_Layer: 5
+  m_Name: clear_main
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5884705281673483543
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 596442702802913212}
+  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: 2217657234056708561}
+  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: -19, y: -37}
+  m_SizeDelta: {x: 234, y: 134}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5553460609119447545
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 596442702802913212}
+  m_CullTransparentMesh: 1
+--- !u!114 &2665067982719249232
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 596442702802913212}
+  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: fa9abdd0fded76644ae6e0c095c2dc5f, 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!1 &1060201412538289446
 GameObject:
  m_ObjectHideFlags: 0
@ -152,6 +227,81 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1131916486762901410
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7609269843380604179}
+  - component: {fileID: 8816556884047370000}
+  - component: {fileID: 4243427863405432562}
+  m_Layer: 5
+  m_Name: clear_sub
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7609269843380604179
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1131916486762901410}
+  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: 6431746156954127508}
+  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: -19, y: -37}
+  m_SizeDelta: {x: 234, y: 134}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8816556884047370000
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1131916486762901410}
+  m_CullTransparentMesh: 1
+--- !u!114 &4243427863405432562
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1131916486762901410}
+  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: fa9abdd0fded76644ae6e0c095c2dc5f, 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!1 &1258452667092919756
 GameObject:
  m_ObjectHideFlags: 0
@ -991,6 +1141,7 @@ RectTransform:
  - {fileID: 6733173578474884555}
  - {fileID: 3154774254392467682}
  - {fileID: 852250020237855766}
+  - {fileID: 7609269843380604179}
  m_Father: {fileID: 8643226523064314600}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -1012,6 +1163,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  t_msg: {fileID: 2036964112977784320}
  t_rate: {fileID: 7849878220754656391}
+  go_clear: {fileID: 1131916486762901410}
 --- !u!222 &6428149049076151399
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -2367,6 +2519,7 @@ RectTransform:
  - {fileID: 3548041208066617114}
  - {fileID: 6614862268398327597}
  - {fileID: 7470358933317595631}
+  - {fileID: 5884705281673483543}
  m_Father: {fileID: 8643226523064314600}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -2391,6 +2544,7 @@ MonoBehaviour:
  go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3}
  t_rate: {fileID: 5584150423876022131}
  t_desc: {fileID: 6165625473146580651}
+  go_clear: {fileID: 596442702802913212}
 --- !u!222 &2736505656579067103
 CanvasRenderer:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/SingletonManagers/Managers/DBManager.cs
+++ b/Assets/Scripts/SingletonManagers/Managers/DBManager.cs
@ -413,7 +413,10 @@ public partial class DBManager : MonoBehaviour

    public void AddGold(long amount, string objectName)
    {
-        saveData.Gold += amount;
+        if (saveData.Gold < 0)
+            saveData.Gold = amount;
+        else
+            saveData.Gold += amount;

        //GameManager.Flamingo.Flamingo.ChangeAssetAmount("Gold", "Gold", amount, saveData.Gold, GameManager.Account.GetUserID(), GameManager.Account.GetUserEmail(), objectName, objectName, "");
        GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGold);
@ -423,6 +426,9 @@ public partial class DBManager : MonoBehaviour
    {
        saveData.Gold -= min;

+        if (saveData.Gold < 0)
+            saveData.Gold = 0;
+
        //GameManager.Flamingo.Flamingo.ChangeAssetAmount("Gold", "Gold", min, saveData.Gold, GameManager.Account.GetUserID(), GameManager.Account.GetUserEmail(), objectName, objectName, "");
        GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGold);
    }
--- a/Assets/Scripts/UI/GamePanel/GamePanel.cs
+++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs
@ -79,9 +79,9 @@ public partial class GamePanel : MonoBehaviour
        { eSubMission.Max, 0 }
    };
    public eMainMission CurMission = eMainMission.Max;
-    bool ShowMainMissionPopup = false;
+    public bool ShowMainMissionPopup = false;
    public eSubMission CurSubMission = eSubMission.Max;
-    bool ShowSubMissionPopup = false;
+    public bool ShowSubMissionPopup = false;

    #region MonoBehaviour
    private void Awake()
--- a/Assets/Scripts/UI/Popup/GoldChargePopup.cs
+++ b/Assets/Scripts/UI/Popup/GoldChargePopup.cs
@ -17,7 +17,7 @@ public class GoldChargePopup : PopupBase

    public void ClickConfirm()
    {
-        // 광고
+        // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
        GameManager.ADS.ShowGoldRewardedAd(this.name);
    }

--- a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs
+++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs
@ -1,10 +1,12 @@
 using CodeJay.Enum;
 using System.Collections.Generic;
 using TMPro;
+using UnityEngine;

 public class MissionOpenPopup_Main : uScrollViewMgr
 {
    public TextMeshProUGUI t_rate, t_desc;
+    public GameObject go_clear;

    public static List<ECardType> MissionCards;

@ -19,6 +21,7 @@ public class MissionOpenPopup_Main : uScrollViewMgr
        t_rate.text = $"x{GamePanel.Instance.dic_missionRate[GamePanel.Instance.CurMission]}";
        MissionCards = Get_ShowUICards(GamePanel.Instance.CurMission);
        Set_ScrollView(MissionCards);
+        go_clear.SetActive(GamePanel.Instance.ShowMainMissionPopup);
    }

    public List<ECardType> Get_ShowUICards(eMainMission mission)
--- a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs
+++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs
@ -6,6 +6,7 @@ using UnityEngine;
 public class MissionOpenPopup_Sub : MonoBehaviour
 {
    public TextMeshProUGUI t_msg, t_rate;
+    public GameObject go_clear;

    private void OnEnable()
    {
@ -17,6 +18,7 @@ public class MissionOpenPopup_Sub : MonoBehaviour

        t_rate.text = $"x{GamePanel.Instance.dic_submisstionRate[GamePanel.Instance.CurSubMission]}";
        t_msg.text = Get_ShowUIText(GamePanel.Instance.CurSubMission);
+        go_clear.SetActive(GamePanel.Instance.ShowSubMissionPopup);
    }

    string Get_ShowUIText(eSubMission mission)
--- a/Assets/UI/Image/CLEAR_mission.png
+++ b/Assets/UI/Image/CLEAR_mission.png
--- a/Assets/UI/Image/CLEAR_mission.png.meta
+++ b/Assets/UI/Image/CLEAR_mission.png.meta
@ -0,0 +1,155 @@
+fileFormatVersion: 2
+guid: fa9abdd0fded76644ae6e0c095c2dc5f
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 1445369835575946641
+    second: CLEAR_mission_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: CLEAR_mission_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 234
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 19da192253cfe0410800000000000000
+      internalID: 1445369835575946641
+      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: 
--- a/Assets/UI/UIAtlas.spriteatlas
+++ b/Assets/UI/UIAtlas.spriteatlas
@ -58,6 +58,7 @@ SpriteAtlas:
    - c784b790d3342a344b381b1aae003d99: 21300000
    - 8388c990b53b08c41b9911ee6e007e62: 21300000
    - ee933fb03eb4e414b9ac5e0e8f715803: 21300000
+    - fa9abdd0fded76644ae6e0c095c2dc5f: 21300000
    - 9a728be0368979641bc27e5cdc038633: 21300000
    - b0729b0100fa5844986e86606239043d: 21300000
    - a35ac2215f4696948b93c2b371cab176: 21300000
@ -217,6 +218,7 @@ SpriteAtlas:
  - {fileID: 21300000, guid: c784b790d3342a344b381b1aae003d99, type: 3}
  - {fileID: 21300000, guid: 8388c990b53b08c41b9911ee6e007e62, type: 3}
  - {fileID: 21300000, guid: ee933fb03eb4e414b9ac5e0e8f715803, type: 3}
+  - {fileID: 21300000, guid: fa9abdd0fded76644ae6e0c095c2dc5f, type: 3}
  - {fileID: 21300000, guid: 9a728be0368979641bc27e5cdc038633, type: 3}
  - {fileID: 21300000, guid: b0729b0100fa5844986e86606239043d, type: 3}
  - {fileID: 21300000, guid: a35ac2215f4696948b93c2b371cab176, type: 3}
@ -375,6 +377,7 @@ SpriteAtlas:
  - bbuckeat image_bbuckeat
  - window 3
  - chodan txt_chodan
+  - CLEAR_mission
  - btn long
  - firstbbuck txt_firstbbuck
  - 3go txt_3go