From 090c7bf518b4a9455f4db5af6a49d7fdb0e02ac4 Mon Sep 17 00:00:00 2001 From: 99jamin <99jamin56@gmail.com> Date: Fri, 21 Mar 2025 16:24:56 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Do-44=20[Feat]=20=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EC=8B=9C=EC=9E=91=20=EC=8B=9C=20=EC=BD=94=EC=9D=B8=20=EC=B0=A8?= =?UTF-8?q?=EA=B0=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/KJM/Admob/AdManager.cs | 8 +-- Assets/KJM/ShopTest/ShopTestKJM.unity | 13 ++++ .../Prefabs/Panels/Main Panel.prefab | 1 + Assets/Script/Common/CoinsPanelController.cs | 8 ++- Assets/Script/Main/MainPanelController.cs | 6 +- Assets/Script/Main/NetworkManager.cs | 66 +++++++++++++++++++ Assets/Script/Main/UserManager.cs | 11 ++++ .../ShopItemController.cs | 5 +- .../Script/UI/PanelController/PanelManager.cs | 20 +++++- 9 files changed, 125 insertions(+), 13 deletions(-) diff --git a/Assets/KJM/Admob/AdManager.cs b/Assets/KJM/Admob/AdManager.cs index 1950296..109c5cb 100644 --- a/Assets/KJM/Admob/AdManager.cs +++ b/Assets/KJM/Admob/AdManager.cs @@ -44,14 +44,14 @@ public class AdManager : MonoBehaviour } // 보상형 전면 광고 실행 - public void ShowRewardedInterstitialAd(CanvasGroup shopPanel) + public void ShowRewardedInterstitialAd() { if (rewardedInterstitialAd != null && rewardedInterstitialAd.CanShowAd()) { rewardedInterstitialAd.Show((Reward reward) => //서버에서 500코인을 고정으로 반환하기 때문에 reward는 사용하지 않음. { // 코인 지급 로직 - GrantReward(shopPanel); + GrantReward(); }); } else @@ -67,12 +67,12 @@ public class AdManager : MonoBehaviour } // 코인 지급 함수 - private void GrantReward(CanvasGroup shopPanel) + private void GrantReward() { NetworkManager.Instance.WatchAdForCoins((coinsAdded) => { // UI 업데이트 - GameManager.Instance.panelManager.UpdateCoinsPanelUI(coinsAdded, shopPanel); + GameManager.Instance.panelManager.UpdateCoinsPanelUI(coinsAdded); }, () => { Debug.Log("광고 시청 후 코인 추가 실패"); diff --git a/Assets/KJM/ShopTest/ShopTestKJM.unity b/Assets/KJM/ShopTest/ShopTestKJM.unity index dda09c9..769da6e 100644 --- a/Assets/KJM/ShopTest/ShopTestKJM.unity +++ b/Assets/KJM/ShopTest/ShopTestKJM.unity @@ -395,6 +395,7 @@ GameObject: - component: {fileID: 1340395581} - component: {fileID: 1340395580} - component: {fileID: 1340395579} + - component: {fileID: 1340395583} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -484,6 +485,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!225 &1340395583 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1340395578} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1377839198 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Panels/Main Panel.prefab b/Assets/Resources/Prefabs/Panels/Main Panel.prefab index 5e9ded7..ef894a8 100644 --- a/Assets/Resources/Prefabs/Panels/Main Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Main Panel.prefab @@ -1713,6 +1713,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_text: kjm m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} diff --git a/Assets/Script/Common/CoinsPanelController.cs b/Assets/Script/Common/CoinsPanelController.cs index 38c3dcd..eba6cae 100644 --- a/Assets/Script/Common/CoinsPanelController.cs +++ b/Assets/Script/Common/CoinsPanelController.cs @@ -20,6 +20,7 @@ public class CoinsPanelController : MonoBehaviour private AudioSource _audioSource; private int _coinsCount; private RectTransform _coinsRect; + private CanvasGroup _canvasGroup; //부모 캔버스 그룹 // 1. 코인 추가 연출 // 2. 코인 감소 연출 @@ -30,6 +31,7 @@ public class CoinsPanelController : MonoBehaviour _audioSource = GetComponent(); _coinsColor = coinsRemoveImageObject.GetComponent().color; _coinsRect = GetComponent(); + _canvasGroup = GetComponentInParent(); } private void Start() @@ -96,9 +98,9 @@ public class CoinsPanelController : MonoBehaviour /// 추가할 코인 수량 /// 상점 패널 캔버스 그룹 /// 애니메이션 종료 후 동작 EX) 코인 수량 변경 - public void AddCoins(int coinsCount, CanvasGroup shopPanel,Action action) + public void AddCoins(int coinsCount, Action action) { - shopPanel.blocksRaycasts = false; //코인 중복 추가 방지 코드 + _canvasGroup.blocksRaycasts = false; //코인 중복 추가 방지 코드 Sequence sequence = DOTween.Sequence(); // i += a 반복 횟수 조절, 100개 단위로 상승 차감 시 100으로 설정 @@ -120,7 +122,7 @@ public class CoinsPanelController : MonoBehaviour } sequence.OnComplete(() => { - shopPanel.blocksRaycasts = true; //구매 후 클릭 활성화 + _canvasGroup.blocksRaycasts = true; //구매 후 클릭 활성화 }); } diff --git a/Assets/Script/Main/MainPanelController.cs b/Assets/Script/Main/MainPanelController.cs index 9f0c9c3..75bde69 100644 --- a/Assets/Script/Main/MainPanelController.cs +++ b/Assets/Script/Main/MainPanelController.cs @@ -82,7 +82,11 @@ public class MainPanelController : MonoBehaviour //대국 시작 버튼 클릭 public void OnClickGameStart() { - GameManager.Instance.ChangeToGameScene(Enums.GameType.SinglePlay); + //코인 차감 후 게임 씬 로드 + GameManager.Instance.panelManager.RemoveCoinsPanelUI((() => + { + GameManager.Instance.ChangeToGameScene(Enums.GameType.SinglePlay); + })); } //상점 패널 생성 diff --git a/Assets/Script/Main/NetworkManager.cs b/Assets/Script/Main/NetworkManager.cs index 903a866..180e998 100644 --- a/Assets/Script/Main/NetworkManager.cs +++ b/Assets/Script/Main/NetworkManager.cs @@ -446,6 +446,72 @@ public class NetworkManager : Singleton } } + /// + /// 코인 제거 함수 + /// + /// + /// + public void DeductCoins(Action success, Action failure) + { + StartCoroutine(DeductCoinsCoroutine(success, failure)); + } + + private IEnumerator DeductCoinsCoroutine(Action success, Action failure) + { + string DeductCoinsUrl = Constants.ServerURL + "/coins/deduct"; + + using (UnityWebRequest www = new UnityWebRequest(DeductCoinsUrl, UnityWebRequest.kHttpVerbPOST)) + { + www.downloadHandler = new DownloadHandlerBuffer(); + string sid = PlayerPrefs.GetString("sid", ""); + + if (!string.IsNullOrEmpty(sid)) + { + www.SetRequestHeader("Cookie", sid); + } + else + { + Debug.LogError("SID 값이 없습니다. 로그인 정보가 없습니다."); + failure?.Invoke("LOGIN_REQUIRED"); + yield break; + } + + yield return www.SendWebRequest(); + + if (www.result == UnityWebRequest.Result.ConnectionError || + www.result == UnityWebRequest.Result.ProtocolError) + { + Debug.LogError("코인 차감 실패: " + www.error); + + if (www.responseCode == 400) + { + failure?.Invoke("INSUFFICIENT_COINS"); + } + else + { + failure?.Invoke("ERROR"); + } + } + else + { + var result = www.downloadHandler.text; + var deductResult = JsonUtility.FromJson(result); + + if (deductResult.result == "SUCCESS") + { + Debug.Log("코인 차감 완료: " + deductResult.deducted); + UserManager.Instance.SetCoinsInfo(); + success?.Invoke(deductResult.deducted); + } + else + { + Debug.LogError("코인 차감 실패: " + deductResult.result); + failure?.Invoke(deductResult.result); + } + } + } + } + public void GetLeaderboardData(Action> success, Action failure) { StartCoroutine(GetLeaderboardDataCoroutine(success, failure)); diff --git a/Assets/Script/Main/UserManager.cs b/Assets/Script/Main/UserManager.cs index 83fff14..c9f99e9 100644 --- a/Assets/Script/Main/UserManager.cs +++ b/Assets/Script/Main/UserManager.cs @@ -58,6 +58,17 @@ public class PurchaseData } } +/// +/// 코인 차감 응답 데이터 클래스 +/// +public class DeductCoinsResult +{ + public string result; + public string message; + public int deducted; + public int remainingCoins; +} + public class UserManager : Singleton diff --git a/Assets/Script/UI/PanelChildController/ShopItemController.cs b/Assets/Script/UI/PanelChildController/ShopItemController.cs index 7b39614..63437bc 100644 --- a/Assets/Script/UI/PanelChildController/ShopItemController.cs +++ b/Assets/Script/UI/PanelChildController/ShopItemController.cs @@ -22,13 +22,12 @@ public class ShopItemController : MonoBehaviour public void OnClickShopItem() { - var shopPanel = GetComponentInParent(); //코인 구매시 상점 패널의 캔버스 그룹 raycast를 비활성화하여 중복클릭 방지. if (_shopItem.price == 0) { //보상형 전면 광고 로드 _adManager = GetComponent(); - _adManager.ShowRewardedInterstitialAd(shopPanel); + _adManager.ShowRewardedInterstitialAd(); } else { @@ -38,7 +37,7 @@ public class ShopItemController : MonoBehaviour _shopItem.name, // 결제 ID "GooglePay", // 결제 방식 (GooglePay, PayPal 등) (coins) => { - GameManager.Instance.panelManager.UpdateCoinsPanelUI(coins,shopPanel); + GameManager.Instance.panelManager.UpdateCoinsPanelUI(coins); }, () => { Debug.LogError("결제 후 코인 충전 실패"); diff --git a/Assets/Script/UI/PanelController/PanelManager.cs b/Assets/Script/UI/PanelController/PanelManager.cs index c1db29f..c037178 100644 --- a/Assets/Script/UI/PanelController/PanelManager.cs +++ b/Assets/Script/UI/PanelController/PanelManager.cs @@ -189,11 +189,11 @@ public class PanelManager : MonoBehaviour } //코인 패널 코인 갱신 - public void UpdateCoinsPanelUI(int coinsChanged, CanvasGroup shopPanel) + public void UpdateCoinsPanelUI(int coinsChanged) { if (_coinsPanel != null) { - _coinsPanel.AddCoins(coinsChanged, shopPanel, () => + _coinsPanel.AddCoins(coinsChanged, () => { }); @@ -204,5 +204,21 @@ public class PanelManager : MonoBehaviour } } + public void RemoveCoinsPanelUI(Action onComplete) + { + NetworkManager.Instance.DeductCoins((i) => + { + + }, (s) => + { + + }); + + _coinsPanel.RemoveCoins((() => + { + onComplete?.Invoke(); + })); + } + } From fa10a4871594e6dc16765c96fd2430b5c87698ed Mon Sep 17 00:00:00 2001 From: 99jamin <99jamin56@gmail.com> Date: Fri, 21 Mar 2025 16:37:27 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Do-44=20[Style]=20=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=ED=8C=A8=EB=84=90=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EB=8D=AE?= =?UTF-8?q?=EC=96=B4=EC=93=B4=20=EC=9D=B4=EB=A6=84=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Prefabs/Panels/Main Panel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Resources/Prefabs/Panels/Main Panel.prefab b/Assets/Resources/Prefabs/Panels/Main Panel.prefab index ef894a8..f117869 100644 --- a/Assets/Resources/Prefabs/Panels/Main Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Main Panel.prefab @@ -1713,7 +1713,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: kjm + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} From bcc93dba43461cd749722489034a424abe681604 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Fri, 21 Mar 2025 17:18:51 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[HOTFIX]=20UI=20=EB=B0=94=EC=9D=B8=EB=94=A9?= =?UTF-8?q?=20=EB=B0=8F=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Prefabs/[Canvas] Game UI.prefab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab index e09470f..73be32a 100644 --- a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab +++ b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab @@ -433,7 +433,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 350} + m_SizeDelta: {x: 0, y: 570} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3625391796739244380 CanvasRenderer: @@ -585,7 +585,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 600} + m_SizeDelta: {x: 0, y: 900} m_Pivot: {x: 0.5, y: 0} --- !u!222 &870318249725167959 CanvasRenderer: @@ -746,7 +746,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 3933575647777291622} m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp m_MethodName: OnClickRetryButton m_Mode: 1 @@ -1223,7 +1223,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 3933575647777291622} m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp m_MethodName: OnClickConfirmButton m_Mode: 1 From 5d3cacde50daf3aca1122b7796ec64a5334a20c6 Mon Sep 17 00:00:00 2001 From: 99jamin <99jamin56@gmail.com> Date: Fri, 21 Mar 2025 17:48:33 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Do-44=20[fix]=20=EA=B2=8C=EC=9E=84=20UI=20?= =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Prefabs/[Canvas] Game UI.prefab | 397 +++++++++--------- 1 file changed, 195 insertions(+), 202 deletions(-) diff --git a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab index 283dc18..73be32a 100644 --- a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab +++ b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab @@ -1,80 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &23766695982208470 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4532012953686283018} - - component: {fileID: 3385207238430958496} - - component: {fileID: 2319801876965501003} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4532012953686283018 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 23766695982208470} - 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: 540353529445133032} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: -0.00012207031} - m_SizeDelta: {x: 1920, y: 3413.3333} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3385207238430958496 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 23766695982208470} - m_CullTransparentMesh: 1 ---- !u!114 &2319801876965501003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 23766695982208470} - 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: a99fa85777f9a5b4d86b859277707544, 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 &78406273393375112 GameObject: m_ObjectHideFlags: 0 @@ -135,7 +60,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8858114, b: 0.380503, a: 1} + m_Color: {r: 1, g: 0.9607844, b: 0.8980393, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -227,7 +152,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 540353529445133032} + - {fileID: 2843270827267453358} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -401,17 +326,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Retry + m_text: "\uC7AC\uB300\uACB0" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, 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: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -428,8 +353,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 0 @@ -503,12 +428,12 @@ RectTransform: - {fileID: 4020956126151567600} - {fileID: 3928015243027423495} - {fileID: 5290633878409985} - m_Father: {fileID: 540353529445133032} + m_Father: {fileID: 2843270827267453358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 1706.6667} - m_SizeDelta: {x: 1920, y: 350} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 570} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3625391796739244380 CanvasRenderer: @@ -531,14 +456,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 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: 0} + m_Sprite: {fileID: 21300000, guid: a99fa85777f9a5b4d86b859277707544, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -613,7 +538,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 2d325c545f7c9144cb37a45e93e5ddb9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -655,12 +580,12 @@ RectTransform: m_Children: - {fileID: 451599240785790819} - {fileID: 6209444297678801107} - m_Father: {fileID: 540353529445133032} + m_Father: {fileID: 2843270827267453358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -1606.6667} - m_SizeDelta: {x: 1920, y: 500} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 900} m_Pivot: {x: 0.5, y: 0} --- !u!222 &870318249725167959 CanvasRenderer: @@ -683,15 +608,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 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: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: a99fa85777f9a5b4d86b859277707544, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -760,7 +685,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8858114, b: 0.380503, a: 1} + m_Color: {r: 1, g: 0.9607844, b: 0.8980393, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -821,7 +746,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8132279047060667277} + - m_Target: {fileID: 3933575647777291622} m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp m_MethodName: OnClickRetryButton m_Mode: 1 @@ -892,7 +817,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.41297808, g: 0.49125245, b: 0.836478, a: 1} + m_Color: {r: 1, g: 0.9607844, b: 0.8980393, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -976,15 +901,15 @@ MonoBehaviour: m_Calls: [] m_text: Player B m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1110,15 +1035,15 @@ MonoBehaviour: m_Calls: [] m_text: White Turn m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1135,8 +1060,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1177,67 +1102,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3791069783579554366 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 540353529445133032} - - component: {fileID: 8132279047060667277} - - component: {fileID: 8937297938790164307} - m_Layer: 0 - m_Name: Game Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &540353529445133032 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3791069783579554366} - serializedVersion: 2 - 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: 4532012953686283018} - - {fileID: 4044003808430543235} - - {fileID: 8942070830740152784} - m_Father: {fileID: 6113787613246818512} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8132279047060667277 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3791069783579554366} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 35a536dce57360441898a57e5d5a1335, type: 3} - m_Name: - m_EditorClassIdentifier: - panelRectTransform: {fileID: 0} ---- !u!225 &8937297938790164307 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3791069783579554366} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!1 &3856590192762510114 GameObject: m_ObjectHideFlags: 0 @@ -1298,15 +1162,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.836478, g: 0.47987702, b: 0.47610846, a: 1} + m_Color: {r: 1, g: 0.9607844, b: 0.8980393, 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: 2b713a3fc08a07045823477e97022e09, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1359,7 +1223,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8132279047060667277} + - m_Target: {fileID: 3933575647777291622} m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp m_MethodName: OnClickConfirmButton m_Mode: 1 @@ -1438,15 +1302,15 @@ MonoBehaviour: m_Calls: [] m_text: Player A m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1570,19 +1434,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Confirm - -' + m_text: "\uCC29\uC218\n" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, 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: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1599,8 +1461,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 0 @@ -1780,7 +1642,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 59492a1d9c2719641bd0d4d53988c9b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1857,15 +1719,15 @@ MonoBehaviour: m_Calls: [] m_text: Black Turn m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1882,8 +1744,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1989,17 +1851,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Surrender + m_text: "\uD56D\uBCF5" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, 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: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2016,8 +1878,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 0 @@ -2117,7 +1979,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.654088, g: 0.1954036, b: 0.1954036, a: 1} + m_Color: {r: 1, g: 0.9607844, b: 0.8980393, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2134,6 +1996,109 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8399016609069797928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2843270827267453358} + - component: {fileID: 5037445855156201367} + - component: {fileID: 6791363912801932183} + - component: {fileID: 3933575647777291622} + - component: {fileID: 5999196603484244259} + m_Layer: 5 + m_Name: Game Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2843270827267453358 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8399016609069797928} + 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: 4044003808430543235} + - {fileID: 8942070830740152784} + m_Father: {fileID: 6113787613246818512} + 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 &5037445855156201367 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8399016609069797928} + m_CullTransparentMesh: 1 +--- !u!114 &6791363912801932183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8399016609069797928} + 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: 0} + 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: 10907, 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!114 &3933575647777291622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8399016609069797928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35a536dce57360441898a57e5d5a1335, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!225 &5999196603484244259 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8399016609069797928} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &8622821704889965313 GameObject: m_ObjectHideFlags: 0 @@ -2179,6 +2144,34 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4044003808430543235} m_Modifications: + - target: {fileID: 1414465240440161498, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + - target: {fileID: 1414465240440161498, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + propertyPath: m_fontColor.b + value: 0.3529412 + objectReference: {fileID: 0} + - target: {fileID: 1414465240440161498, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + propertyPath: m_fontColor.g + value: 0.4156863 + objectReference: {fileID: 0} + - target: {fileID: 1414465240440161498, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + propertyPath: m_fontColor.r + value: 0.3137255 + objectReference: {fileID: 0} + - target: {fileID: 1414465240440161498, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} + - target: {fileID: 1414465240440161498, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + propertyPath: m_fontColor32.rgba + value: 4284115536 + objectReference: {fileID: 0} + - target: {fileID: 1414465240440161498, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4060305112283542636, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} propertyPath: m_Pivot.x value: 0.5