Compare commits
No commits in common. "045870e72bb6e1a6cf35c6b6fb51ccd05373bef5" and "ca0d0e23d3636a88116cf672ffb1a46f24abe231" have entirely different histories.
045870e72b
...
ca0d0e23d3
|
|
@ -25,7 +25,6 @@ namespace ES3Types
|
||||||
writer.WriteProperty("IsRemoveADS", instance.IsRemoveADS, ES3Type_bool.Instance);
|
writer.WriteProperty("IsRemoveADS", instance.IsRemoveADS, ES3Type_bool.Instance);
|
||||||
writer.WriteProperty("GameSpeed", instance.GameSpeed, ES3Type_float.Instance);
|
writer.WriteProperty("GameSpeed", instance.GameSpeed, ES3Type_float.Instance);
|
||||||
writer.WriteProperty("ProductAdWatchedNumber", instance.ProductAdWatchedNumber, ES3Type_int.Instance);
|
writer.WriteProperty("ProductAdWatchedNumber", instance.ProductAdWatchedNumber, ES3Type_int.Instance);
|
||||||
writer.WriteProperty("ProductAdWatchedTime", instance.ProductAdWatchedTime, ES3Type_DateTime.Instance);
|
|
||||||
writer.WriteProperty("FreeHeartCount", instance.FreeHeartCount, ES3Type_int.Instance);
|
writer.WriteProperty("FreeHeartCount", instance.FreeHeartCount, ES3Type_int.Instance);
|
||||||
writer.WriteProperty("FreeKeyCount", instance.FreeKeyCount, ES3Type_int.Instance);
|
writer.WriteProperty("FreeKeyCount", instance.FreeKeyCount, ES3Type_int.Instance);
|
||||||
writer.WriteProperty("InterstitialADCount", instance.InterstitialADCount, ES3Type_int.Instance);
|
writer.WriteProperty("InterstitialADCount", instance.InterstitialADCount, ES3Type_int.Instance);
|
||||||
|
|
@ -73,9 +72,6 @@ namespace ES3Types
|
||||||
case "ProductAdWatchedNumber":
|
case "ProductAdWatchedNumber":
|
||||||
instance.ProductAdWatchedNumber = reader.Read<System.Int32>(ES3Type_int.Instance);
|
instance.ProductAdWatchedNumber = reader.Read<System.Int32>(ES3Type_int.Instance);
|
||||||
break;
|
break;
|
||||||
case "ProductAdWatchedTime":
|
|
||||||
instance.ProductAdWatchedTime = reader.Read<System.DateTime>(ES3Type_DateTime.Instance);
|
|
||||||
break;
|
|
||||||
case "FreeHeartCount":
|
case "FreeHeartCount":
|
||||||
instance.FreeHeartCount = reader.Read<System.Int32>(ES3Type_int.Instance);
|
instance.FreeHeartCount = reader.Read<System.Int32>(ES3Type_int.Instance);
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -486,8 +486,8 @@ MonoBehaviour:
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\uAD11\uACE0 \uC2DC\uCCAD\uC744 \uD1B5\uD55C \uBB34\uB8CC \uD558\uD2B8\uB97C
|
m_text: "\uB354 \uC774\uC0C1 \uAD11\uACE0 \uC2DC\uCCAD\uC744 \uD1B5\uD55C \r\n\uBB34\uB8CC
|
||||||
\uC5BB\uC744 \uC218 \uC788\uB294\n\uC2DC\uAC04\uC774 \uB0A8\uC544\uC788\uC2B5\uB2C8\uB2E4."
|
\uD558\uD2B8\uB97C \uC5BB\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
|
||||||
m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
|
m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ namespace CodeJay
|
||||||
|
|
||||||
/// <summary>Number of Watched Ad In Store(Ad Heart Product).</summary>
|
/// <summary>Number of Watched Ad In Store(Ad Heart Product).</summary>
|
||||||
public int ProductAdWatchedNumber;
|
public int ProductAdWatchedNumber;
|
||||||
public DateTime ProductAdWatchedTime;
|
|
||||||
public int FreeHeartCount, FreeKeyCount;
|
public int FreeHeartCount, FreeKeyCount;
|
||||||
public int InterstitialADCount;
|
public int InterstitialADCount;
|
||||||
|
|
||||||
|
|
@ -92,7 +91,6 @@ namespace CodeJay
|
||||||
this.IsRemoveADS = data.IsRemoveADS;
|
this.IsRemoveADS = data.IsRemoveADS;
|
||||||
this.GameSpeed = data.GameSpeed;
|
this.GameSpeed = data.GameSpeed;
|
||||||
this.ProductAdWatchedNumber = data.ProductAdWatchedNumber;
|
this.ProductAdWatchedNumber = data.ProductAdWatchedNumber;
|
||||||
ProductAdWatchedTime = data.ProductAdWatchedTime;
|
|
||||||
this.FreeHeartCount = data.FreeHeartCount;
|
this.FreeHeartCount = data.FreeHeartCount;
|
||||||
FreeKeyCount = data.FreeKeyCount;
|
FreeKeyCount = data.FreeKeyCount;
|
||||||
this.InterstitialADCount = data.InterstitialADCount;
|
this.InterstitialADCount = data.InterstitialADCount;
|
||||||
|
|
@ -233,7 +231,6 @@ public partial class DBManager : MonoBehaviour
|
||||||
public long BuyKeyCount { get => saveData.BuyKeyCount; }
|
public long BuyKeyCount { get => saveData.BuyKeyCount; }
|
||||||
public float GameSpeed { get => saveData.GameSpeed; set => saveData.GameSpeed = value; }
|
public float GameSpeed { get => saveData.GameSpeed; set => saveData.GameSpeed = value; }
|
||||||
public int ProductAdWatchedNumber { get => saveData.ProductAdWatchedNumber; }
|
public int ProductAdWatchedNumber { get => saveData.ProductAdWatchedNumber; }
|
||||||
public DateTime ProductAdWatchedTime { get => saveData.ProductAdWatchedTime; }
|
|
||||||
public int FreeHeartCount { get => saveData.FreeHeartCount; }
|
public int FreeHeartCount { get => saveData.FreeHeartCount; }
|
||||||
public int FreeKeyCount { get => saveData.FreeKeyCount; }
|
public int FreeKeyCount { get => saveData.FreeKeyCount; }
|
||||||
public int NormalGameLevel { get => saveData.NormalGameLevel; }
|
public int NormalGameLevel { get => saveData.NormalGameLevel; }
|
||||||
|
|
@ -785,10 +782,6 @@ public partial class DBManager : MonoBehaviour
|
||||||
if (saveData != null)
|
if (saveData != null)
|
||||||
{
|
{
|
||||||
saveData.ProductAdWatchedNumber -= min;
|
saveData.ProductAdWatchedNumber -= min;
|
||||||
if (saveData.ProductAdWatchedNumber < 0)
|
|
||||||
saveData.ProductAdWatchedNumber = 0;
|
|
||||||
if (saveData.ProductAdWatchedNumber == 0)
|
|
||||||
saveData.ProductAdWatchedTime = InternetTime.Ins.Time.AddHours(1);
|
|
||||||
SaveDatas();
|
SaveDatas();
|
||||||
|
|
||||||
return saveData.ProductAdWatchedNumber;
|
return saveData.ProductAdWatchedNumber;
|
||||||
|
|
@ -796,14 +789,6 @@ public partial class DBManager : MonoBehaviour
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
public void ProductAdWatchedNumber_Plus()
|
|
||||||
{
|
|
||||||
if (saveData != null)
|
|
||||||
{
|
|
||||||
saveData.ProductAdWatchedNumber = 1;
|
|
||||||
SaveDatas();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ResetFreeHeartCount()
|
public void ResetFreeHeartCount()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
using CodeJay.Classes;
|
using CodeJay.Classes;
|
||||||
using CodeJay.Defines;
|
using CodeJay.Defines;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
@ -265,13 +264,11 @@ public class ProductSlot : CardBase
|
||||||
|
|
||||||
private void SetADSButton()
|
private void SetADSButton()
|
||||||
{
|
{
|
||||||
StopAllCoroutines();
|
|
||||||
|
|
||||||
// 광고 이벤트 연결하기
|
// 광고 이벤트 연결하기
|
||||||
GameManager.ADS.OnCompletedRewardedAd += OnCompletedRewardedAd;
|
GameManager.ADS.OnCompletedRewardedAd += OnCompletedRewardedAd;
|
||||||
|
|
||||||
DateTime loadTime = GameManager.Timer.LoadTime();
|
DateTime loadTime = GameManager.Timer.LoadTime();
|
||||||
if (loadTime.Day != InternetTime.Ins.Time.Day)
|
if (loadTime.Day != DateTime.Now.Day)
|
||||||
{
|
{
|
||||||
GameManager.DB.ResetADSRewardActionCount();
|
GameManager.DB.ResetADSRewardActionCount();
|
||||||
GameManager.DB.ResetFreeHeartCount();
|
GameManager.DB.ResetFreeHeartCount();
|
||||||
|
|
@ -279,35 +276,7 @@ public class ProductSlot : CardBase
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (GameManager.DB.ProductAdWatchedNumber <= 0)
|
GameManager.Timer.ActivateLoadSimpleTimer(name, Constants.ADS_TIMER_COUNT, OnStartTimer, OnPauseTimer, OnStopTimer, OnPassedTime);
|
||||||
StartCoroutine(Co_Time());
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (AdButton != null)
|
|
||||||
{
|
|
||||||
Color c = AdButton.GetComponent<Image>().color;
|
|
||||||
c.a = 1.0f;
|
|
||||||
AdButton.GetComponent<Image>().color = c;
|
|
||||||
}
|
|
||||||
SetADSRewardActionCountText(GameManager.DB.ProductAdWatchedNumber);
|
|
||||||
}
|
|
||||||
//GameManager.Timer.ActivateLoadSimpleTimer(name, Constants.ADS_TIMER_COUNT, OnStartTimer, OnPauseTimer, OnStopTimer, OnPassedTime);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
IEnumerator Co_Time()
|
|
||||||
{
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
yield return new WaitForSeconds(1f);
|
|
||||||
var cal = GameManager.DB.ProductAdWatchedTime - InternetTime.Ins.Time;
|
|
||||||
if (cal.TotalSeconds > 0)
|
|
||||||
AdNumberTMP.text = DSUtil.Get_TimeText_MS(cal);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
GameManager.DB.ProductAdWatchedNumber_Plus();
|
|
||||||
SetData(_data);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -529,8 +498,6 @@ public class ProductSlot : CardBase
|
||||||
{
|
{
|
||||||
if (timerCount <= 0)
|
if (timerCount <= 0)
|
||||||
{
|
{
|
||||||
if (GameManager.DB.ProductAdWatchedNumber == 0)
|
|
||||||
GameManager.DB.ProductAdWatchedNumber_Plus();
|
|
||||||
SetADSRewardActionCountText(GameManager.DB.ProductAdWatchedNumber);
|
SetADSRewardActionCountText(GameManager.DB.ProductAdWatchedNumber);
|
||||||
GameManager.Timer.DeactivateTimer(name);
|
GameManager.Timer.DeactivateTimer(name);
|
||||||
//buyButton.onClick.AddListener(OnBuyButtonClicked);
|
//buyButton.onClick.AddListener(OnBuyButtonClicked);
|
||||||
|
|
@ -605,8 +572,7 @@ public class ProductSlot : CardBase
|
||||||
|
|
||||||
if (GameManager.DB.ProductAdWatchedNumber == 0)
|
if (GameManager.DB.ProductAdWatchedNumber == 0)
|
||||||
{
|
{
|
||||||
SetADSButton();
|
GameManager.Timer.ActivateSimpleTimer(name, Constants.ADS_TIMER_COUNT, OnStartTimer, OnPauseTimer, OnStopTimer, OnPassedTime);
|
||||||
//GameManager.Timer.ActivateSimpleTimer(name, Constants.ADS_TIMER_COUNT, OnStartTimer, OnPauseTimer, OnStopTimer, OnPassedTime);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
{
|
|
||||||
"EnvironmentName": "",
|
|
||||||
"EnvironmentId": "00000000-0000-0000-0000-000000000000"
|
|
||||||
}
|
|
||||||
|
|
@ -926,11 +926,11 @@ PlayerSettings:
|
||||||
captureStartupLogs: {}
|
captureStartupLogs: {}
|
||||||
activeInputHandler: 0
|
activeInputHandler: 0
|
||||||
windowsGamepadBackendHint: 0
|
windowsGamepadBackendHint: 0
|
||||||
cloudProjectId: ce57d1f7-de4f-4541-b8ce-cba2fcfe82b3
|
cloudProjectId: 5fd5767a-af95-4147-a047-6025b4ab9d1e
|
||||||
framebufferDepthMemorylessMode: 0
|
framebufferDepthMemorylessMode: 0
|
||||||
qualitySettingsNames: []
|
qualitySettingsNames: []
|
||||||
projectName: "\uB79C\uB364 \uC5EC\uCE5C \uB9DE\uACE0"
|
projectName: HuntingGostop_onestore
|
||||||
organizationId: kuma3trio
|
organizationId: jjakgwi
|
||||||
cloudEnabled: 0
|
cloudEnabled: 0
|
||||||
legacyClampBlendShapeWeights: 0
|
legacyClampBlendShapeWeights: 0
|
||||||
hmiLoadingImage: {fileID: 0}
|
hmiLoadingImage: {fileID: 0}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue