diff --git a/Assets/BGDataBase/bansheegz_database.bytes b/Assets/BGDataBase/bansheegz_database.bytes index 09e0643..c927388 100644 Binary files a/Assets/BGDataBase/bansheegz_database.bytes and b/Assets/BGDataBase/bansheegz_database.bytes differ diff --git a/Assets/Bundles/Prefabs/HwatooImageCard.prefab b/Assets/Bundles/Prefabs/HwatooImageCard.prefab new file mode 100644 index 0000000..d1ed31b --- /dev/null +++ b/Assets/Bundles/Prefabs/HwatooImageCard.prefab @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8311175157444695672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8311175157444695673} + - component: {fileID: 7413551750217715027} + - component: {fileID: 8311175157444695675} + - component: {fileID: 8311175157444695674} + m_Layer: 5 + m_Name: HwatooImageCard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8311175157444695673 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8311175157444695672} + 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: 0} + 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: 0} + m_SizeDelta: {x: 226, y: 340} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7413551750217715027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8311175157444695672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a09c71f7bf9ebe4cb7491cf81e5a196, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &8311175157444695675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8311175157444695672} + m_CullTransparentMesh: 1 +--- !u!114 &8311175157444695674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8311175157444695672} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -3512303834708110928, guid: 4719d12111eb5b44fbe5c77c5fc3fd21, 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 diff --git a/Assets/Bundles/Prefabs/HwatooImageCard.prefab.meta b/Assets/Bundles/Prefabs/HwatooImageCard.prefab.meta new file mode 100644 index 0000000..ef7bcb0 --- /dev/null +++ b/Assets/Bundles/Prefabs/HwatooImageCard.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 663e18f98f297f547a0729aca0f70b7e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab b/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab index f20fdfc..0b74165 100644 --- a/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab +++ b/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab @@ -358,6 +358,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1391901315529568633} + - component: {fileID: 5154968747852882121} m_Layer: 5 m_Name: Gwang m_TagString: Untagged @@ -387,6 +388,22 @@ RectTransform: m_AnchoredPosition: {x: 281.0648, y: -449.7954} m_SizeDelta: {x: 481.5887, y: 272.0556} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5154968747852882121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 241561588182140710} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83c9e60149d58e14c8e0205173521aff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 7488859297709381919} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} + t_count: {fileID: 4293180551207073614} --- !u!1 &307708133254029013 GameObject: m_ObjectHideFlags: 0 @@ -396,6 +413,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 765586235226444726} + - component: {fileID: 4150669612253930577} m_Layer: 5 m_Name: Ddee m_TagString: Untagged @@ -425,6 +443,22 @@ RectTransform: m_AnchoredPosition: {x: 281.0648, y: -1036} m_SizeDelta: {x: 481.5887, y: 272.0556} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4150669612253930577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307708133254029013} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf79e20bffafd22409f815450a19d436, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 537757301450216035} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} + t_count: {fileID: 8582663628830745958} --- !u!1 &537757301450216035 GameObject: m_ObjectHideFlags: 0 @@ -496,6 +530,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6367227737800485562} + - component: {fileID: 8455429799972820126} m_Layer: 5 m_Name: Pee m_TagString: Untagged @@ -525,6 +560,22 @@ RectTransform: m_AnchoredPosition: {x: 281.0648, y: -1327} m_SizeDelta: {x: 481.5887, y: 272.0556} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8455429799972820126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331029582477704900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5ce4a5778a93cb4f887e596ee56047b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 4299529538520911694} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} + t_count: {fileID: 3518317505259489695} --- !u!1 &1571714306943675069 GameObject: m_ObjectHideFlags: 0 @@ -1409,6 +1460,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 165a74256720bb141b1ea60c377a8e69, type: 3} m_Name: m_EditorClassIdentifier: + i_ai: {fileID: 664651953786031124} texts: - {fileID: 2695456803996330160} - {fileID: 5524890384078822100} @@ -1424,13 +1476,6 @@ MonoBehaviour: - {fileID: 6282846932038403616} - {fileID: 8582663628830745958} - {fileID: 3518317505259489695} - tf_main: {fileID: 7589875562521408021} - tf_sub: {fileID: 739552100766238278} - tf_gwang: {fileID: 2040854915461823544} - tf_yulggeut: {fileID: 2293096001007689525} - tf_ddee: {fileID: 763810998961547822} - tf_pee: {fileID: 8084037670316093894} - tf_cards: {fileID: 4096672825378999784} --- !u!1 &3392032435278874687 GameObject: m_ObjectHideFlags: 0 @@ -1576,6 +1621,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1429393471871818747} + - component: {fileID: 9123226841466715133} m_Layer: 5 m_Name: YulGgeut m_TagString: Untagged @@ -1605,6 +1651,22 @@ RectTransform: m_AnchoredPosition: {x: 281.0648, y: -744} m_SizeDelta: {x: 481.5887, y: 272.0556} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &9123226841466715133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3451116222170219784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a323d42fd248f834d99aec9b7d229334, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 3537848864423964585} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} + t_count: {fileID: 6282846932038403616} --- !u!1 &3537848864423964585 GameObject: m_ObjectHideFlags: 0 @@ -2939,7 +3001,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.58431375, g: 0.58431375, b: 0.58431375, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2967,6 +3029,7 @@ GameObject: - component: {fileID: 5530246707204506897} - component: {fileID: 7777133300826778693} - component: {fileID: 89024466949443644} + - component: {fileID: 4938741057591613838} m_Layer: 5 m_Name: SubMission m_TagString: Untagged @@ -3034,6 +3097,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4938741057591613838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191102621354526968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a41b461c17a1c344a48e15545b9bcb9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 5789515768441840515} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} --- !u!1 &6277194819688644752 GameObject: m_ObjectHideFlags: 0 @@ -3857,6 +3935,7 @@ GameObject: - component: {fileID: 8802628057108190579} - component: {fileID: 1424041968535582925} - component: {fileID: 3200292659820316740} + - component: {fileID: 4071316716105856251} m_Layer: 5 m_Name: MainMission m_TagString: Untagged @@ -3924,6 +4003,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4071316716105856251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7332673993261995017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 042c4c0e296acaa47b1ba921857a8eeb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 5593461439686352843} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} --- !u!1 &7384136686623961455 GameObject: m_ObjectHideFlags: 0 @@ -4700,6 +4794,7 @@ GameObject: - component: {fileID: 7240461492647414965} - component: {fileID: 7667533732213384640} - component: {fileID: 2731703931626379052} + - component: {fileID: 8371596465982241011} m_Layer: 5 m_Name: ObtainCards m_TagString: Untagged @@ -4766,6 +4861,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8371596465982241011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8928331021391289304} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4b0ade4e1f0c4418b0132cd389191b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 8433113579068196571} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} --- !u!1 &9101728442137204013 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 6ef7ccf..e92a5da 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -73122,8 +73122,8 @@ RectTransform: m_GameObject: {fileID: 1129600969} 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_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2128021907} - {fileID: 727989098} @@ -115371,8 +115371,8 @@ RectTransform: m_GameObject: {fileID: 1655609076} 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_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1643606554} - {fileID: 294027873} diff --git a/Assets/Scripts/SingletonManagers/Managers/AccountManager.cs b/Assets/Scripts/SingletonManagers/Managers/AccountManager.cs index c8a0b5b..b33e375 100644 --- a/Assets/Scripts/SingletonManagers/Managers/AccountManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/AccountManager.cs @@ -20,7 +20,7 @@ public class AccountManager : MonoBehaviour { public string Email; public int Level; - public int UnlockDataCount; + public int UnlockDataCount_Left, UnlockDataCount_Right; public long Gold; public long Heart; public long Key; @@ -90,13 +90,13 @@ public class AccountManager : MonoBehaviour Firebase.Analytics.FirebaseAnalytics.UserPropertySignUpMethod, "Google"); - AutoSignIn(); + //AutoSignIn(); } void OnDestroy() { - auth.StateChanged -= AuthStateChanged; - auth = null; + //auth.StateChanged -= AuthStateChanged; + //auth = null; } public void SignOut() @@ -531,8 +531,9 @@ public class AccountManager : MonoBehaviour var jsonFile = dataSnapshot.GetRawJsonValue(); UploadData downloadData = JsonConvert.DeserializeObject(jsonFile); - if (downloadData.UnlockDataCount > GameManager.DB.GetUnlockTargetIndex(true) || - downloadData.Level > GameManager.DB.NormalGameLevel) + if (downloadData.UnlockDataCount_Left > GameManager.DB.GetUnlockTargetIndex(true) || + downloadData.UnlockDataCount_Right > GameManager.DB.GetUnlockTargetIndex(false) || + downloadData.Level > GameManager.DB.NormalGameLevel) { Debug.Log("AccountManager: CheckExistSaveData: OverWriteSave"); } @@ -568,7 +569,8 @@ public class AccountManager : MonoBehaviour { uploadData.Email = user.Email; - uploadData.UnlockDataCount = GameManager.DB.GetUnlockTargetIndex(true); + uploadData.UnlockDataCount_Left = GameManager.DB.GetUnlockTargetIndex(true); + uploadData.UnlockDataCount_Right = GameManager.DB.GetUnlockTargetIndex(false); uploadData.Gold = GameManager.DB.Gold; uploadData.Heart = GameManager.DB.Heart; uploadData.Key = GameManager.DB.Key; @@ -679,7 +681,8 @@ public class AccountManager : MonoBehaviour var jsonFile = dataSnapshot.GetRawJsonValue(); UploadData downloadData = JsonConvert.DeserializeObject(jsonFile); - GameManager.DB.DonwloadUnlockDataCount(downloadData.UnlockDataCount); + GameManager.DB.DonwloadUnlockDataCount(downloadData.UnlockDataCount_Left); + GameManager.DB.DonwloadUnlockDataCount(downloadData.UnlockDataCount_Right); GameManager.DB.DonwloadGoldData(downloadData.Gold); GameManager.DB.DonwloadHeartData(downloadData.Heart); GameManager.DB.DonwloadKeyData(downloadData.Key); diff --git a/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs b/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs index b511fba..79e04e0 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs @@ -70,6 +70,7 @@ public partial class GamePanel : MonoBehaviour private List _lstPlayerHandCardTypes; /// AI CardTypes private List _lstAIHandCardTypes; + public List Get_AIHandCards() { return _lstAIHandCardTypes; } /// AI Hand Gudide Types. private List _lstAIHandGuideTypes; @@ -77,6 +78,7 @@ public partial class GamePanel : MonoBehaviour private List _lstPlayerScoreCards; /// AI's Card Types In Player ScoreBoard. private List _lstAIScoreCards; + public List Get_AIScoreCards() { return _lstAIScoreCards; } /// this List used when Bring a card In coroMoveToScoreBoard Coroutine. private List _lstAvailableCardTypes; diff --git a/Assets/Scripts/UI/Popup/PreviewUI.meta b/Assets/Scripts/UI/Popup/PreviewUI.meta new file mode 100644 index 0000000..77532bc --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93cfb08f06b76b6428ae762997d3f093 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Popup/PreviewUI/HwatooImageCard.cs b/Assets/Scripts/UI/Popup/PreviewUI/HwatooImageCard.cs new file mode 100644 index 0000000..57fe1f6 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/HwatooImageCard.cs @@ -0,0 +1,12 @@ +using CodeJay.Enum; +using UnityEngine.UI; + +public class HwatooImageCard : CardBase +{ + public override void Set(T _base, int iLoop = -1, int idata = -1) + { + base.Set(_base, iLoop, idata); + var CardType = DSUtil.StringToEnum(_base.ToString()); + GetComponent().sprite = GameManager.Resource.GetSprite(CardType); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/HwatooImageCard.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/HwatooImageCard.cs.meta new file mode 100644 index 0000000..ce1a993 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/HwatooImageCard.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7a09c71f7bf9ebe4cb7491cf81e5a196 \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_AiCards.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_AiCards.cs new file mode 100644 index 0000000..c0e70cb --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_AiCards.cs @@ -0,0 +1,7 @@ +public class PreviewUIPopup_AiCards : uScrollViewMgr +{ + private void OnEnable() + { + Set_ScrollView(GamePanel.Instance.Get_AIHandCards().FindAll(f=>f < CodeJay.Enum.ECardType.Back)); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_AiCards.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_AiCards.cs.meta new file mode 100644 index 0000000..8863115 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_AiCards.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2a4b0ade4e1f0c4418b0132cd389191b \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Ddee.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Ddee.cs new file mode 100644 index 0000000..a144f48 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Ddee.cs @@ -0,0 +1,15 @@ +using TMPro; + +public class PreviewUIPopup_Ddee : uScrollViewMgr +{ + public TextMeshProUGUI t_count; + + private void OnEnable() + { + var allcards = GamePanel.Instance.Get_AIScoreCards(); + var last = allcards.FindAll(f => f.ToString().Contains("Hongdan") || f.ToString().Contains("Chodan") || + f.ToString().Contains("Chungdan") || f.ToString().Contains("Tee")); + t_count.text = last.Count.ToString(); + Set_ScrollView(last); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Ddee.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Ddee.cs.meta new file mode 100644 index 0000000..fbe69c0 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Ddee.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bf79e20bffafd22409f815450a19d436 \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Gwang.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Gwang.cs new file mode 100644 index 0000000..1c0ff8e --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Gwang.cs @@ -0,0 +1,13 @@ +using TMPro; + +public class PreviewUIPopup_Gwang : uScrollViewMgr +{ + public TextMeshProUGUI t_count; + + private void OnEnable() + { + var last = GamePanel.Instance.Get_AIScoreCards().FindAll(f => f.ToString().Contains("Ghwang")); + t_count.text = last.Count.ToString(); + Set_ScrollView(last); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Gwang.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Gwang.cs.meta new file mode 100644 index 0000000..0ffe13c --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Gwang.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 83c9e60149d58e14c8e0205173521aff \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs new file mode 100644 index 0000000..8b17836 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs @@ -0,0 +1,4 @@ +public class PreviewUIPopup_MainMission : uScrollViewMgr +{ + +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs.meta new file mode 100644 index 0000000..a06c5fd --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 042c4c0e296acaa47b1ba921857a8eeb \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Pee.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Pee.cs new file mode 100644 index 0000000..08e045d --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Pee.cs @@ -0,0 +1,15 @@ +using TMPro; + +public class PreviewUIPopup_Pee : uScrollViewMgr +{ + public TextMeshProUGUI t_count; + + private void OnEnable() + { + var allcards = GamePanel.Instance.Get_AIScoreCards(); + var last = allcards.FindAll(f => f.ToString().Contains("Normal") || f.ToString().Contains("Double") || + f.ToString().Contains("Pee")); + t_count.text = last.Count.ToString(); + Set_ScrollView(last); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Pee.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Pee.cs.meta new file mode 100644 index 0000000..60807ba --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_Pee.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f5ce4a5778a93cb4f887e596ee56047b \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs new file mode 100644 index 0000000..f60d2c5 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs @@ -0,0 +1,4 @@ +public class PreviewUIPopup_SubMission : uScrollViewMgr +{ + +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs.meta new file mode 100644 index 0000000..fe0ef13 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1a41b461c17a1c344a48e15545b9bcb9 \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_YulGgeut.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_YulGgeut.cs new file mode 100644 index 0000000..7a51030 --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_YulGgeut.cs @@ -0,0 +1,15 @@ +using TMPro; + +public class PreviewUIPopup_YulGgeut : uScrollViewMgr +{ + public TextMeshProUGUI t_count; + + private void OnEnable() + { + var allcards = GamePanel.Instance.Get_AIScoreCards(); + var last = allcards.FindAll(f => f.ToString().Contains("Bird") || f.ToString().Contains("Yulkkeut") || + f.ToString().Contains("Yulgget")); + t_count.text = last.Count.ToString(); + Set_ScrollView(last); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_YulGgeut.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_YulGgeut.cs.meta new file mode 100644 index 0000000..0dd5c7b --- /dev/null +++ b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_YulGgeut.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a323d42fd248f834d99aec9b7d229334 \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUIPopup.cs b/Assets/Scripts/UI/Popup/PreviewUIPopup.cs index e3c82ce..70ae433 100644 --- a/Assets/Scripts/UI/Popup/PreviewUIPopup.cs +++ b/Assets/Scripts/UI/Popup/PreviewUIPopup.cs @@ -1,18 +1,73 @@ +using CodeJay.Enum; using TMPro; -using UnityEngine; +using UnityEngine.UI; public class PreviewUIPopup : PopupBase { + public Image i_ai; public TextMeshProUGUI[] texts; // 0 소지금, 1 레벨, 2 0점 X 0배, 3 고, 4 흔듦, 5 뻑 public TextMeshProUGUI[] texts_mission; // 0 메인 미션, 1 서브 미션 public TextMeshProUGUI[] texts_cardcount; // 0 광, 1 열끗, 2 띠, 3 피 - public Transform tf_main, tf_sub, tf_gwang, tf_yulggeut, tf_ddee, tf_pee, tf_cards; public override void ShowPopup(int drawOrder) { base.ShowPopup(drawOrder); GameManager.Sound.PlaySFX(ESFXType.Open_Popup); GameManager.ADS.HideBanner(); + + i_ai.sprite = DB_HuntingData.GetEntity(GameManager.DB.GetUnlockTargetIndex(true) << 1).DBF_HuntingImage; + texts[0].text = GamePanel.Instance.AIGoldTMP.text; + texts[1].text = $"Lv.{GameManager.DB.NormalGameLevel}"; + Set_Point(); + texts[3].text = GamePanel.Instance.AI_Go.ToString(); + texts[4].text = GamePanel.Instance.AI_Bell.ToString(); + texts[5].text = GamePanel.Instance.AI_Bbug.ToString(); + } + + void Set_Point() + { + int score = GamePanel.Instance.GetTotalScore(false, false); + int goNumer = GamePanel.Instance.AI_Go; + int multiply = 1; + string str = $"{score}점"; + + if (goNumer == 1) + { + str += " + 1고(1점) "; + score += 1; + } + else if (goNumer == 2) + { + str += " + 2고(2점) "; + score += 2; + } + else if (goNumer >= 3) + { + GamePanel.Instance.AddMultiplyType(EScoreMutiplyType.Go); + } + + + var multipleType = GamePanel.Instance.GetAndUpdateScoreMultiplyType(false); + + if (multipleType != null) + { + for (int i = 0; i < multipleType.Count; i++) + { + if (multiply <= 0) + multiply = 1; + + var val = CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]); + if (multipleType[i] == EScoreMutiplyType.Shake) + val *= GamePanel.Instance.Player_Bell; + else if (multipleType[i] == EScoreMutiplyType.ClickedFromResultPopup) + val *= GamePanel.Instance.Player_Milgi; + else if (multipleType[i] == EScoreMutiplyType.Go) + val *= goNumer - 2; + multiply *= val; + } + } + + texts[2].text = str + $" x {multiply}배"; } public void ClickCancel() diff --git a/Assets/UI/엿보기 팝업 스샷.png b/Assets/UI/엿보기 팝업 스샷.png deleted file mode 100644 index c4c1797..0000000 Binary files a/Assets/UI/엿보기 팝업 스샷.png and /dev/null differ diff --git a/Assets/UI/엿보기 팝업 스샷.png.meta b/Assets/UI/엿보기 팝업 스샷.png.meta deleted file mode 100644 index ceba7ff..0000000 --- a/Assets/UI/엿보기 팝업 스샷.png.meta +++ /dev/null @@ -1,156 +0,0 @@ -fileFormatVersion: 2 -guid: 7e0416d085d08be4b8c0e25da17e723c -TextureImporter: - internalIDToNameTable: - - first: - 213: -8220345905277232415 - second: "\uC5FF\uBCF4\uAE30 \uD31D\uC5C5 \uC2A4\uC0F7_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: "\uC5FF\uBCF4\uAE30 \uD31D\uC5C5 \uC2A4\uC0F7_0" - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1100 - height: 1920 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 1ea1d11d3f67bed80800000000000000 - internalID: -8220345905277232415 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - "\uC5FF\uBCF4\uAE30 \uD31D\uC5C5 \uC2A4\uC0F7_0": -8220345905277232415 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: