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

Merge branch 'feature/1.3.0' of bitbucket.org:usaya/popcorn into feature/1.3.0

This commit is contained in:
koya_15 2022-05-17 11:27:58 +09:00
parent 77609d40f8 16c08b8c02
commit 8fcc3bc8be
3 changed files with 156 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity
View File

@ -288,7 +288,7 @@ PrefabInstance:
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
@ -2424,7 +2424,7 @@ PrefabInstance:
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
@ -6146,6 +6146,7 @@ MonoBehaviour:
bulkOrderResetButton: {fileID: 1344540256}
shopLevelUpResetButton: {fileID: 1349073832}
dailyMissionResetButton: {fileID: 297099900}
dailyMissionCompleteButton: {fileID: 2146514805}
normalMissionResetButton: {fileID: 1001425729}
autoCookCompleteButton: {fileID: 916882297}
resetShopCustomizeButton: {fileID: 2107025835}
@ -7106,7 +7107,7 @@ PrefabInstance:
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
@ -7263,3 +7264,144 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -0.000045776367}
m_SizeDelta: {x: 0, y: 80}
m_Pivot: {x: 0.5, y: 1}
--- !u!1001 &2146514804
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 785180939}
m_Modifications:
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_Text
value: "\u30C7\u30A4\u30EA\u30FC\n\u30DF\u30C3\u30B7\u30E7\u30F3\n\u5B8C\u4E86"
objectReference: {fileID: 0}
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_Name
value: DailyMissionComplete
objectReference: {fileID: 0}
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3}
--- !u!114 &2146514805 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb,
type: 3}
m_PrefabInstance: {fileID: 2146514804}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:

9
popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
View File

@ -22,6 +22,7 @@ public class DebugOptionManager : MonoBehaviour
[SerializeField] private Button bulkOrderResetButton;
[SerializeField] private Button shopLevelUpResetButton;
[SerializeField] private Button dailyMissionResetButton;
[SerializeField] private Button dailyMissionCompleteButton;
[SerializeField] private Button normalMissionResetButton;
[SerializeField] private Button autoCookCompleteButton;
[SerializeField] private Button resetShopCustomizeButton;
@ -151,6 +152,12 @@ public class DebugOptionManager : MonoBehaviour
gameData.lastDailyMissionSetTime = DateTime.MinValue.ToBinary();
}).AddTo(this);
dailyMissionCompleteButton.OnClickAsObservable().Subscribe(_ =>
{
gameData.dailyMissionAchievedIdArray = gameData.dailyMissionIdArray;
gameData.dailyMissionCompleted = false;
}).AddTo(this);
normalMissionResetButton.OnClickAsObservable().Subscribe(_ =>
{
gameData.AchievedMission.Clear();
@ -164,7 +171,7 @@ public class DebugOptionManager : MonoBehaviour
resetShopCustomizeButton.OnClickAsObservable().Subscribe(_ =>
{
gameData.ShopCustomizeLevel = 0;
gameData.ShopCustomizeLevel = 1;
gameData.ShopCustomizePoint = 0;
gameData.ShopCustomizeCoin = 0;
gameData.ShopCustomizeSettings = new ShopCustomizeSettings();

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

@ -455,8 +455,8 @@ public sealed class ShopCustomizeData {
public int price;
public int point;
public string prefabName;
public string Name => "hoge";
public string Text => "huga";
public string Name => LocalizationManager.GetTranslation($"Item/ShopCustomizeName{id:0000}");
public string Text => LocalizationManager.GetTranslation($"Item/ShopCustomizeText{id:0000}");
public ShopCustomizeCategory Category => (ShopCustomizeCategory)category;
public Transform GetPrefab()
@ -466,8 +466,7 @@ public sealed class ShopCustomizeData {
public Transform GetIconPrefab()
{
// return Resources.Load<Transform>($"ShopCustomizeIcons/{GetCategoryString(Category)}_{prefabName}");
return Resources.Load<Transform>($"ShopCustomizeIcons/{GetCategoryString(Category)}_a");
return Resources.Load<Transform>($"ShopCustomizeIcons/{GetCategoryString(Category)}_{prefabName}");
}
private string GetCategoryString(ShopCustomizeCategory category)