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

コイン表示対応

This commit is contained in:
kimura 2021-08-05 09:20:09 +09:00
parent 2b4f50b354
commit 42cacfdd79
15 changed files with 409 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
popcorn/Assets/MyGame/Resource/Animation/Icon_Coin.controller
View File

@ -11,7 +11,10 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 4475377242917876395}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 240, y: 20, z: 0}
- serializedVersion: 1
m_State: {fileID: 4433783371595394980}
m_Position: {x: 240, y: 130, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -21,7 +24,29 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 4475377242917876395}
m_DefaultState: {fileID: 4433783371595394980}
--- !u!1101 &-3628628858844245727
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.42307693
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -30,7 +55,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: Icon_Coin
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: Add
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -44,6 +75,58 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1600421813888881856
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Add
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4475377242917876395}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &4433783371595394980
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Wait
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1600421813888881856}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &4475377242917876395
AnimatorState:
serializedVersion: 5
@ -54,7 +137,8 @@ AnimatorState:
m_Name: EffectCoin
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: -3628628858844245727}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0

31
popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
View File

@ -768,6 +768,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
--- !u!114 &387414333 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832512110619, 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: 351b4ffae35e149bf81549887561d561, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &395704523
GameObject:
m_ObjectHideFlags: 0
@ -1403,6 +1415,7 @@ GameObject:
- component: {fileID: 715847676}
- component: {fileID: 715847675}
- component: {fileID: 715847677}
- component: {fileID: 715847678}
m_Layer: 0
m_Name: Manager
m_TagString: Untagged
@ -1460,6 +1473,24 @@ MonoBehaviour:
content: {fileID: 2122087243}
menuButton: {fileID: 1992043646}
closeButton: {fileID: 1133743353}
--- !u!114 &715847678
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 715847674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
m_Name:
m_EditorClassIdentifier:
coinIconTransform: {fileID: 0}
coinCountText: {fileID: 387414333}
coinAnimator: {fileID: 0}
coinPrefab: {fileID: 0}
duration: 0.5
rootTransform: {fileID: 0}
--- !u!114 &730756546 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7809777061605929427, guid: caaa748dbeed576499e8cae74d33f689,

3
popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs
View File

@ -41,8 +41,7 @@ public class CornField : MonoBehaviour
// データ
var gameData = GameDataManager.GameData;
gameData.coin = 1000 + Random.Range(0, 1000);
// Debug.Log(gameData.coin);
CoinManager.Instance.ChangeCoin(gameData.coin);
// 解放済みの畑
gameData.PlantLineTypes = new List<(PlantLineType type, CornFieldRank level)>()
{

36
popcorn/Assets/MyGame/Scenes/Main/Main.unity
View File

@ -1064,6 +1064,7 @@ GameObject:
m_Component:
- component: {fileID: 1870432534}
- component: {fileID: 1870432533}
- component: {fileID: 1870432535}
m_Layer: 0
m_Name: Manager
m_TagString: Untagged
@ -1098,6 +1099,24 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1870432535
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1870432532}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
m_Name:
m_EditorClassIdentifier:
coinIconTransform: {fileID: 0}
coinCountText: {fileID: 3664916832445709977}
coinAnimator: {fileID: 0}
coinPrefab: {fileID: 0}
duration: 0.5
rootTransform: {fileID: 0}
--- !u!1001 &1914907653
PrefabInstance:
m_ObjectHideFlags: 0
@ -1821,6 +1840,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
--- !u!114 &3664916832445709977 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &3665723643790057849
PrefabInstance:
m_ObjectHideFlags: 0
@ -1828,6 +1859,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1187654216}
m_Modifications:
- target: {fileID: 3072131335653526340, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82,
type: 3}
propertyPath: m_RootOrder

176
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab
View File

@ -1021,7 +1021,6 @@ RectTransform:
- {fileID: 320398124}
- {fileID: 130281750}
- {fileID: 7545339558603919741}
- {fileID: 1174152334443072208}
m_Father: {fileID: 3664916832564167477}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1672,178 +1671,3 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 3691625806369805098}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7021272912307370562
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3664916832844628215}
m_Modifications:
- target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 445
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396421809467539, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_Name
value: EarnedCoins
objectReference: {fileID: 0}
- target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, type: 3}
--- !u!224 &1174152334443072208 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
m_PrefabInstance: {fileID: 7021272912307370562}
m_PrefabAsset: {fileID: 0}

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -17,5 +17,7 @@ public class KitchenManager : MonoBehaviour
TransitionManager.Instance.LoadSceneAdditive(GameScenes.Recipe);
});
var gameData = GameDataManager.GameData;
CoinManager.Instance.ChangeCoin(gameData.coin);
}
}

8
popcorn/Assets/MyGame/Scenes/marketing/Scripts.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ae377568aff6d4d839ee5c4428c2d2ea
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

25
popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs Normal file
View File

@ -0,0 +1,25 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UniRx;
using UnityEngine;
public class Market : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
var gameData = GameDataManager.GameData;
CoinManager.Instance.ChangeCoin(gameData.coin);
Observable.Interval(TimeSpan.FromSeconds(2f)).Subscribe(_ =>
{
CoinManager.Instance.AddCoinWithEffect(300, () => { });
}).AddTo(this);
}
// Update is called once per frame
void Update()
{
}
}

11
popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: cf4a253e4bfcb47f18e7d6f28af64b01
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

111
popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
View File

@ -1004,6 +1004,12 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!224 &393700031 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 714437464}
m_PrefabAsset: {fileID: 0}
--- !u!4 &424265800 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6,
@ -1433,32 +1439,32 @@ PrefabInstance:
- target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 91.25
objectReference: {fileID: 0}
- target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 89.625
objectReference: {fileID: 0}
- target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1174152334443072208, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 135.25
objectReference: {fileID: 0}
- target: {fileID: 1174152334443072208, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
@ -1483,7 +1489,7 @@ PrefabInstance:
- target: {fileID: 1174152334443072209, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1174152334880891972, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
@ -1493,27 +1499,27 @@ PrefabInstance:
- target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 44
objectReference: {fileID: 0}
- target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 22
objectReference: {fileID: 0}
- target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -22
objectReference: {fileID: 0}
- target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
@ -2169,6 +2175,69 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1025201113
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1025201115}
- component: {fileID: 1025201114}
- component: {fileID: 1025201116}
m_Layer: 0
m_Name: Manager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1025201114
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1025201113}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
m_Name:
m_EditorClassIdentifier:
coinIconTransform: {fileID: 393700031}
coinCountText: {fileID: 1898034353}
coinAnimator: {fileID: 77455597}
coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
type: 3}
duration: 0.5
rootTransform: {fileID: 1991225675}
--- !u!4 &1025201115
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1025201113}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1025201116
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1025201113}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cf4a253e4bfcb47f18e7d6f28af64b01, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1035509476
GameObject:
m_ObjectHideFlags: 0
@ -4067,6 +4136,18 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1898034353 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 714437464}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1898891707
PrefabInstance:
m_ObjectHideFlags: 0
@ -4259,6 +4340,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1959722117}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1991225675 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 714437464}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2016817760
GameObject:
m_ObjectHideFlags: 0

8
popcorn/Assets/MyGame/Scenes/shopping/Scripts.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 218ec1e5576e74f079b70f1999eaf01f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

13
popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs Normal file
View File

@ -0,0 +1,13 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Shopping : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
var gameData = GameDataManager.GameData;
CoinManager.Instance.ChangeCoin(gameData.coin);
}
}

11
popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e7b7e1a23513042b0bbac3c91ccab081
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

63
popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
View File

@ -850,7 +850,7 @@ RectTransform:
- {fileID: 1615189014}
- {fileID: 1286971210}
m_Father: {fileID: 1098091308}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1625,6 +1625,18 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1098091307}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1098091309 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 1098091307}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1102915445
GameObject:
m_ObjectHideFlags: 0
@ -2183,6 +2195,55 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1470533649}
m_CullTransparentMesh: 0
--- !u!1 &1474305257
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1474305258}
- component: {fileID: 1474305259}
m_Layer: 0
m_Name: Manager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1474305258
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1474305257}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1474305259
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1474305257}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
m_Name:
m_EditorClassIdentifier:
coinIconTransform: {fileID: 0}
coinCountText: {fileID: 1098091309}
coinAnimator: {fileID: 0}
coinPrefab: {fileID: 0}
duration: 0.5
rootTransform: {fileID: 0}
--- !u!1 &1551965076
GameObject:
m_ObjectHideFlags: 0

41
popcorn/Assets/MyGame/Scripts/CoinManager.cs
View File

@ -6,6 +6,8 @@ using UnityEngine.UI;
public class CoinManager : SingletonMonoBehaviour<CoinManager>
{
private static readonly int Add = Animator.StringToHash("Add");
// CoinView
[SerializeField] private RectTransform coinIconTransform;
[SerializeField] private TextWithCountUpInt coinCountText;
@ -20,7 +22,7 @@ public class CoinManager : SingletonMonoBehaviour<CoinManager>
private int ownCoin;
public int OwnCoin => ownCoin;
private string coinTextFormat = "{0}";
void Awake(){
if(CheckInstance()) return ;
}
@ -52,31 +54,16 @@ public class CoinManager : SingletonMonoBehaviour<CoinManager>
private void InstantiateEffeect(RectTransform prefab, int count, Vector3 from, Vector3 to, Action callback)
{
var baseAngle = UnityEngine.Random.value * 360.0f;
var angle = -360.0f / count;
//コインアニメーション
for(int i = 0; i < count; ++i){
var index = i;
// 円状にバラけてた位置を生成
var tempPosition = from + (Vector3)Vector2.up.RotateDeg(baseAngle + i * angle + angle * UnityEngine.Random.value * 0.5f) * (0.2f + UnityEngine.Random.value * 0.8f);
// 0.1秒ごとにコインを生成
this.CallWaitForSeconds(index * 0.1f, () => {
var effect = Instantiate(prefab, tempPosition, Quaternion.identity, rootTransform);
// 表示から1秒経ったら0.2秒かけてコイン表示部分に飛んでいく
this.CallWaitForSeconds(1.0f, () => {
this.CallLerp(0.2f, t => {
effect.position = Vector3.Lerp(tempPosition, to, t * t);
}, () => {
// コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生
VibrationManager.Instance.PlayVibrationOnceWeak();
coinAnimator.SetTrigger("Add");
SoundManager.Instance.PlaySE("se_coin_count");
// コインは削除
Destroy(effect.gameObject);
});
});
});
}
this.CallWaitForSeconds(1.0f + 0.2f, callback);
var effect = Instantiate(prefab, Vector3.zero, Quaternion.identity, rootTransform);
// アニメ50フレーム
this.CallWaitForSeconds(1.0f, () => {
// コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生
VibrationManager.Instance.PlayVibrationOnceWeak();
coinAnimator.SetTrigger(Add);
// SoundManager.Instance.PlaySE("se_coin_count");
// コインは削除
Destroy(effect.gameObject);
callback.Invoke();
});
}
}