金币倒计时推送
This commit is contained in:
parent
0cf6e082f8
commit
2eaf562cb4
|
|
@ -187,6 +187,8 @@ public class JoypacStaticBuildPostProcessor
|
|||
plist.root.SetBoolean("Identity", false);
|
||||
plist.root.SetBoolean("LegalName", false);
|
||||
|
||||
plist.root.SetString("KlevinApplicationIdentifier", "");
|
||||
|
||||
File.WriteAllText(plistPath, plist.WriteToString());
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,12 @@ public class JoypacManager : MonoBehaviour
|
|||
JoypacAdManager.Instance.Init();//逻辑顺序别动
|
||||
JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Basic, StaticStringsEvent.PRE_START, StaticStringsEvent.PRE_START);
|
||||
|
||||
LocalNotificationManager.Instance.Init();//推送
|
||||
|
||||
NotificationMessage(PushText(), 12, true);
|
||||
|
||||
NotificationMessage(PushText(), 18, true);
|
||||
|
||||
#if ANDROID_GP
|
||||
JoypacFBManager.Instance.Init();
|
||||
#endif
|
||||
|
|
@ -62,6 +68,41 @@ public class JoypacManager : MonoBehaviour
|
|||
DontDestroyOnLoad(gameObject);
|
||||
}
|
||||
|
||||
|
||||
public string PushText()
|
||||
{
|
||||
int temp= Random.Range(1,3);
|
||||
string text = "";
|
||||
switch (temp)
|
||||
{
|
||||
case 1:
|
||||
text = "客人们都想念你爆米花的味道啦~";
|
||||
break;
|
||||
case 2:
|
||||
text = "是时候来收玉米做一锅香喷喷的爆米花啦~";
|
||||
break;
|
||||
case 3:
|
||||
text = "新的配方,新的味道,快做来尝一尝呀~";
|
||||
break;
|
||||
default:
|
||||
Debug.Log("temp"+ temp);
|
||||
break;
|
||||
}
|
||||
return text;
|
||||
|
||||
}
|
||||
|
||||
public void NotificationMessage(string message, int hour, bool isRepeatDay)
|
||||
{
|
||||
int year = System.DateTime.Now.Year;
|
||||
int month = System.DateTime.Now.Month;
|
||||
int day = System.DateTime.Now.Day;
|
||||
System.DateTime newDate = new System.DateTime(year, month, day, hour, 0, 0);
|
||||
|
||||
LocalNotificationManager.NotificationMessage(message, newDate, isRepeatDay);
|
||||
|
||||
}
|
||||
|
||||
IEnumerator CrossEnumerator()
|
||||
{
|
||||
#if CROSS && UNITY_IOS
|
||||
|
|
|
|||
|
|
@ -202,19 +202,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &31339499
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414353}
|
||||
--- !u!1 &32741089
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -778,19 +765,6 @@ MonoBehaviour:
|
|||
cullCornRate: 0.9
|
||||
firstCornLimit: 160
|
||||
secondCornLimit: 250
|
||||
--- !u!114 &305093359
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414346}
|
||||
--- !u!1 &315104241
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -821,19 +795,6 @@ Transform:
|
|||
m_Father: {fileID: 2040636316}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
--- !u!114 &316789975
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414350}
|
||||
--- !u!1 &323920545
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1024,7 +985,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1106859980}
|
||||
m_Father: {fileID: 387414334}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -1235,18 +1196,33 @@ PrefabInstance:
|
|||
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 11
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2535613031869306226, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2535613031869306226, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2535613031869306226, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 134.89453
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2535613031869306226, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 450
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2835369144934501534, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
@ -1495,13 +1471,18 @@ PrefabInstance:
|
|||
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8591874021033984247, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
|
||||
--- !u!1 &387414333 stripped
|
||||
|
|
@ -1637,150 +1618,6 @@ MonoBehaviour:
|
|||
randomPlaySEFilenames: []
|
||||
randomPlayVoiceFilenames: []
|
||||
vibrationType: 0
|
||||
--- !u!114 &387414344 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414345 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414346 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414347 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414348 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414349 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 521511634720853184, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414350 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4466880344787820340, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414351 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1339603270, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414352 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8117515348220274205, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414353 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1750965193008879782, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414354 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1464061990, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &387414355 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916833050583564, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &457045027
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1939,19 +1776,6 @@ MonoBehaviour:
|
|||
mGUI_ShowCallback: 0
|
||||
mLocalizeTarget: {fileID: 260671573}
|
||||
mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image
|
||||
--- !u!114 &466380812
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414352}
|
||||
--- !u!95 &473560054 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 1908936244342333737, guid: 0949d70c1a73342ca8955c7f59c04fe0,
|
||||
|
|
@ -2071,19 +1895,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &513520004
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414347}
|
||||
--- !u!1 &521469529
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2302,19 +2113,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 1657f65ff2fe42ba87efbe278055bb7d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &563871743
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414345}
|
||||
--- !u!1 &619114158
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2921,19 +2719,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &731385908
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414351}
|
||||
--- !u!1 &737572416 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3547190356963695060, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
|
|
@ -3140,19 +2925,6 @@ Transform:
|
|||
m_Father: {fileID: 1866526865}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &888149486
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414355}
|
||||
--- !u!1 &895001958
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3264,19 +3036,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &906243848
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414348}
|
||||
--- !u!1 &925906674
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4957,19 +4716,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &1535126674
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414344}
|
||||
--- !u!1 &1537737291
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5002,19 +4748,6 @@ Transform:
|
|||
m_Father: {fileID: 1866526865}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1564257283
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 1507187603938887412}
|
||||
--- !u!1001 &1589622939
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -15352,19 +15085,6 @@ ParticleSystem:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
vectorLabel1_3: W
|
||||
--- !u!114 &1850113378
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414354}
|
||||
--- !u!114 &1859409048 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6168082219279810231, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
|
|
@ -15907,19 +15627,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1958951427}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1975174681
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 387414349}
|
||||
--- !u!1 &1989990597
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -16989,18 +16696,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 5679af969476421ebe68e352455c525f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1507187603938887412 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1507187604136703913, guid: 21599f8e6d1104a07b0b14b49f8c1429,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1507187603938887410}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &4107102217382154191
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1160,7 +1160,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 407927298}
|
||||
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_LocalScale: {x: 1.2, y: 1.2, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 445566314}
|
||||
- {fileID: 1967400435}
|
||||
|
|
@ -1169,7 +1169,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 43, y: 473}
|
||||
m_AnchoredPosition: {x: 43, y: 460}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &414580708 stripped
|
||||
|
|
@ -5209,6 +5209,8 @@ MonoBehaviour:
|
|||
refreshRewardCoin: 100
|
||||
cookingButton: {fileID: 414580708}
|
||||
adButton: {fileID: 445566315}
|
||||
DisableObject: {fileID: 1967400434}
|
||||
remainTimeText: {fileID: 82006170}
|
||||
kitchenView: {fileID: 1870432536}
|
||||
orderIndicatorView: {fileID: 2021031102}
|
||||
--- !u!4 &1870432534
|
||||
|
|
@ -6280,12 +6282,12 @@ PrefabInstance:
|
|||
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2835369144934501534, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -17,13 +17,19 @@ public class KitchenManager : MonoBehaviour
|
|||
[SerializeField] int refreshRewardCoin = 100;
|
||||
[SerializeField] private Button cookingButton;
|
||||
[SerializeField] private Button adButton;
|
||||
|
||||
[SerializeField] private GameObject DisableObject;
|
||||
[SerializeField] private Text remainTimeText;
|
||||
|
||||
[SerializeField] private KitchenView kitchenView;
|
||||
[SerializeField] private BulkOrderIndicatorView orderIndicatorView;
|
||||
|
||||
private readonly Subject<Unit> showAdDialogSubject = new Subject<Unit>();
|
||||
private IDisposable timerDisposable = null;
|
||||
private IDisposable tapPhoneDisposable;
|
||||
|
||||
|
||||
|
||||
bool isshowad = false;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
|
@ -160,10 +166,15 @@ public class KitchenManager : MonoBehaviour
|
|||
CoinManager.Instance.AddCoin(refreshRewardCoin);
|
||||
gameData.Coin = CoinManager.Instance.OwnCoin;
|
||||
gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(refreshWaitTime).ToBinary();
|
||||
#if UNITY_EDITOR
|
||||
gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(10).ToBinary();
|
||||
#endif
|
||||
GameDataManager.SaveGameData();
|
||||
|
||||
// SetTimer((int)refreshWaitTime);
|
||||
adButton.gameObject.SetActive(false);
|
||||
isshowad = false;
|
||||
StartCoroutine(TimeCountDown());
|
||||
if (gameData.kitchenRefreshTime % 10 < livelyRate)
|
||||
{
|
||||
kitchenView.SetLivelyAnimation();
|
||||
|
|
@ -179,9 +190,13 @@ public class KitchenManager : MonoBehaviour
|
|||
// 休憩リワード
|
||||
var remaining = (int) DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds;
|
||||
// timerDisposable = SetTimer(remaining);
|
||||
|
||||
// 商品在庫計算
|
||||
var shopStock = gameData.ShopStock.Count;
|
||||
|
||||
|
||||
StartCoroutine(TimeCountDown());
|
||||
|
||||
|
||||
// 商品在庫計算
|
||||
var shopStock = gameData.ShopStock.Count;
|
||||
var tankStock = gameData.StorageTanks.Sum(x => x.Stock);
|
||||
var totalStock = shopStock + tankStock;
|
||||
|
||||
|
|
@ -190,6 +205,7 @@ public class KitchenManager : MonoBehaviour
|
|||
// コイン獲得有効
|
||||
adButton.gameObject.SetActive(true);
|
||||
kitchenView.SetNormalAnimation();
|
||||
isshowad = true;
|
||||
}
|
||||
else if (gameData.Coin + gameData.Material.Sum(data => data.Amount) + totalStock == 0)
|
||||
{
|
||||
|
|
@ -197,6 +213,7 @@ public class KitchenManager : MonoBehaviour
|
|||
adButton.gameObject.SetActive(true);
|
||||
kitchenView.SetNormalAnimation();
|
||||
showAdDialogSubject.OnNext(Unit.Default);
|
||||
isshowad = true;
|
||||
}
|
||||
else if (remaining > 0)
|
||||
{
|
||||
|
|
@ -357,6 +374,63 @@ public class KitchenManager : MonoBehaviour
|
|||
}).AddTo(this);
|
||||
}
|
||||
|
||||
|
||||
IEnumerator TimeCountDown()
|
||||
{
|
||||
if (isshowad)
|
||||
{
|
||||
yield break;
|
||||
}
|
||||
var gameData = GameDataManager.GameData;
|
||||
var remaining = (int)DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds;
|
||||
SetButtonActive(remaining <= 0);
|
||||
SetTime(remaining);
|
||||
yield return new WaitForSeconds(1f);
|
||||
if (remaining<=0)
|
||||
{
|
||||
SetButtonActive(remaining <= 0);
|
||||
SetTime(remaining);
|
||||
yield break;
|
||||
}
|
||||
|
||||
yield return TimeCountDown();
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void SetButtonActive(bool active)
|
||||
{
|
||||
adButton.gameObject.SetActive(active);
|
||||
DisableObject.SetActive(!active);
|
||||
}
|
||||
private static readonly string remainTimeFormat = "{0:D2}:{1:D2}";
|
||||
private void SetTime(int seconds)
|
||||
{
|
||||
seconds = Mathf.Max(0, seconds);
|
||||
remainTimeText.text = string.Format(remainTimeFormat, seconds / 60, seconds % 60);
|
||||
}
|
||||
|
||||
public void ResetTimer(int time)
|
||||
{
|
||||
// タイマーの更新処理
|
||||
timerDisposable?.Dispose();
|
||||
SetButtonActive(time <= 0);
|
||||
SetTime(time);
|
||||
timerDisposable = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f))
|
||||
.Select(x => (int)(time - x))
|
||||
.TakeWhile(x => x > 0)
|
||||
.Subscribe(x =>
|
||||
{
|
||||
SetTime(x);
|
||||
}, () =>
|
||||
{
|
||||
SetButtonActive(true);
|
||||
}).AddTo(this);
|
||||
}
|
||||
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
if (SoundManager.ExistsInstance)
|
||||
|
|
|
|||
|
|
@ -3759,6 +3759,21 @@ PrefabInstance:
|
|||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1.2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 800
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
|
|
@ -4024,6 +4039,16 @@ PrefabInstance:
|
|||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -4034,6 +4059,11 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 510
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8591874021033984247, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ public sealed class LocalNotificationManager : JoypacSingleMonoBehaviour<LocalNo
|
|||
#endregion
|
||||
#if UNITY_IOS
|
||||
#region IOS 推送
|
||||
static void NotificationMessage(string message, System.DateTime newDate, bool isRepeatDay)
|
||||
public static void NotificationMessage(string message, System.DateTime newDate, bool isRepeatDay)
|
||||
{
|
||||
//推送时间需要大于当前时间
|
||||
if (newDate > System.DateTime.Now)
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ PlayerSettings:
|
|||
cursorHotspot: {x: 0, y: 0}
|
||||
m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_ShowUnitySplashScreen: 1
|
||||
m_ShowUnitySplashLogo: 1
|
||||
m_ShowUnitySplashLogo: 0
|
||||
m_SplashScreenOverlayOpacity: 1
|
||||
m_SplashScreenAnimation: 0
|
||||
m_SplashScreenLogoStyle: 0
|
||||
|
|
@ -127,7 +127,7 @@ PlayerSettings:
|
|||
16:10: 1
|
||||
16:9: 1
|
||||
Others: 1
|
||||
bundleVersion: 1.1.0
|
||||
bundleVersion: 1.1.2
|
||||
preloadedAssets: []
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
|
|
@ -751,7 +751,7 @@ PlayerSettings:
|
|||
webGLWasmStreaming: 0
|
||||
scriptingDefineSymbols:
|
||||
1: TextMeshPro
|
||||
4: TextMeshPro
|
||||
4: TextMeshPro;Notifications
|
||||
7: TextMeshPro
|
||||
13: TextMeshPro
|
||||
14: TextMeshPro
|
||||
|
|
|
|||
Loading…
Reference in New Issue