yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

constその他追加

This commit is contained in:
kimura 2022-06-24 14:07:10 +09:00
parent a8a3609612
commit 61b6f17673
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
View File

@ -89,7 +89,6 @@ namespace MyGame.Scenes.MiniGame.Scripts
}).AddTo(this); }).AddTo(this);
break; break;
case GameState.Success: case GameState.Success:
resultManager.ShowResult();
break; break;
case GameState.Failure: case GameState.Failure:
break; break;

6
popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs
View File

@ -154,7 +154,7 @@ public class Shopping : MonoBehaviour
} }
} }
private void AddItem(ShopData shopData, int amount) public static void AddItem(ShopData shopData, int amount)
{ {
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
switch (shopData.Category) switch (shopData.Category)
@ -178,13 +178,13 @@ public class Shopping : MonoBehaviour
gameData.MyRecipes = new List<int>(gameData.MyRecipes){shopData.itemId}.ToArray(); gameData.MyRecipes = new List<int>(gameData.MyRecipes){shopData.itemId}.ToArray();
gameData.DailyRecipeGetCount++; gameData.DailyRecipeGetCount++;
} }
break; break;
case ItemCategory.Pan: case ItemCategory.Pan:
if (!gameData.Pans.Contains(shopData.itemId)) if (!gameData.Pans.Contains(shopData.itemId))
{ {
gameData.Pans = new List<int>(gameData.Pans){shopData.itemId}.ToArray(); gameData.Pans = new List<int>(gameData.Pans){shopData.itemId}.ToArray();
} }
break; break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }

5
popcorn/Assets/MyGame/Scripts/Const.cs
View File

@ -32,6 +32,7 @@ public static class Const {
public static readonly int ShopCustomizeDefaultDecoration2Id = 5; public static readonly int ShopCustomizeDefaultDecoration2Id = 5;
public static readonly int DailyMissionCompleteRewardShopCustomizeCoin = 5; public static readonly int DailyMissionCompleteRewardShopCustomizeCoin = 5;
public static readonly int ScrollGameDailyPlayMaxCount = 4; public static readonly int ScrollGameDailyPlayMaxCount = 4;
public static readonly int ScrollGameDailyResetOffsetHours = 0; // 翌日0時基準
// tag // tag
public static readonly string GameDataTag = "GameData"; public static readonly string GameDataTag = "GameData";
@ -62,6 +63,8 @@ public static class Const {
public static readonly string ShopCustomizeDataSheet = "ShopCustomizeData"; public static readonly string ShopCustomizeDataSheet = "ShopCustomizeData";
public static readonly string ShopCustomizeLevelDataSheet = "ShopCustomizeLevelData"; public static readonly string ShopCustomizeLevelDataSheet = "ShopCustomizeLevelData";
public static readonly string ShopCustomizeBonusDataSheet = "ShopCustomizeBonusData"; public static readonly string ShopCustomizeBonusDataSheet = "ShopCustomizeBonusData";
public static readonly string ScrollGamePlaceDataSheet = "ScrollGamePlaceData";
public static readonly string ScrollGameStageDataSheet = "ScrollGameStageData";
// language // language
public static readonly string LangJapanDataSheet = "LangJapanData"; public static readonly string LangJapanDataSheet = "LangJapanData";
@ -99,6 +102,8 @@ public static class Const {
new SheetData(Const.ShopCustomizeDataSheet), new SheetData(Const.ShopCustomizeDataSheet),
new SheetData(Const.ShopCustomizeLevelDataSheet), new SheetData(Const.ShopCustomizeLevelDataSheet),
new SheetData(Const.ShopCustomizeBonusDataSheet), new SheetData(Const.ShopCustomizeBonusDataSheet),
new SheetData(Const.ScrollGamePlaceDataSheet),
new SheetData(Const.ScrollGameStageDataSheet),
}; };
public static readonly SheetData[] LanguageSheetNameList = new SheetData[]{ public static readonly SheetData[] LanguageSheetNameList = new SheetData[]{
new SheetData(Const.LangJapanDataSheet, "LanguageData"), new SheetData(Const.LangJapanDataSheet, "LanguageData"),

7
popcorn/Assets/MyGame/Scripts/GameDataManager.cs
View File

@ -366,6 +366,7 @@ public sealed class GameData {
return DateTime.FromBinary(lastDailyMissionSetTime).ToLocalTime().AddHours(Const.DailyMissionResetOffset).Date return DateTime.FromBinary(lastDailyMissionSetTime).ToLocalTime().AddHours(Const.DailyMissionResetOffset).Date
.AddDays(1).AddHours(-Const.DailyMissionResetOffset) .AddDays(1).AddHours(-Const.DailyMissionResetOffset)
.Subtract(DateTime.UtcNow.ToLocalTime()); .Subtract(DateTime.UtcNow.ToLocalTime());
// return CalcLimitTime(lastDailyMissionSetTime, Const.DailyMissionResetOffset); // 要検証
} }
public void FinishTutorial() public void FinishTutorial()
@ -430,6 +431,12 @@ public sealed class GameData {
FlavorId = -1, FlavorId = -1,
}); });
} }
private TimeSpan CalcLimitTime(long time, int offsetHour) => DateTime.FromBinary(time).ToLocalTime()
.Date.AddDays(1).AddHours(offsetHour)
.Subtract(DateTime.UtcNow.ToLocalTime());
public TimeSpan GetScrollGameLimitTime() => CalcLimitTime(ScrollGameLastPlayTime, Const.ScrollGameDailyResetOffsetHours);
// public void ChangeAvatar(AvatarData avatarData){ // public void ChangeAvatar(AvatarData avatarData){
// newAvatarIdList.Remove(avatarData.id); // newAvatarIdList.Remove(avatarData.id);