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

仕入れアイテムクラス追加

This commit is contained in:
kimura 2021-09-09 12:54:31 +09:00
parent 8ac96a85fe
commit 0328eb60d1
10 changed files with 2743 additions and 2415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab
View File

@ -122,7 +122,6 @@ GameObject:
- component: {fileID: 8536603422629144348}
- component: {fileID: 8536603422629144345}
- component: {fileID: 8536603422629144346}
- component: {fileID: 8536603422629144347}
m_Layer: 5
m_Name: Button_on
m_TagString: Untagged
@ -187,49 +186,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8536603422629144347
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8536603422629144349}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8536603422629144346}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &8536603422802196746
GameObject:
m_ObjectHideFlags: 0
@ -239,6 +195,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8536603422802196745}
- component: {fileID: 1458252247847964818}
- component: {fileID: 1342298367473717200}
m_Layer: 5
m_Name: Button_purchase
m_TagString: Untagged
@ -268,6 +226,65 @@ RectTransform:
m_AnchoredPosition: {x: -135, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1458252247847964818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8536603422802196746}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b7d4e426d24898817abfdca0387221, type: 3}
m_Name:
m_EditorClassIdentifier:
purchaseButton: {fileID: 1342298367473717200}
onObject: {fileID: 8536603422629144349}
offObject: {fileID: 8536603424418812070}
soldOutObject: {fileID: 8536603424566114136}
--- !u!114 &1342298367473717200
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8536603422802196746}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &8536603422883751236
GameObject:
m_ObjectHideFlags: 0
@ -505,6 +522,7 @@ GameObject:
- component: {fileID: 8536603423520130721}
- component: {fileID: 8536603423520130783}
- component: {fileID: 8536603423520130720}
- component: {fileID: 8023342812979047025}
m_Layer: 5
m_Name: Frame
m_TagString: Untagged
@ -574,6 +592,24 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8023342812979047025
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8536603423520130722}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bc46478b26ac4ac2a35987667b2e4505, type: 3}
m_Name:
m_EditorClassIdentifier:
detailButton: {fileID: 8536603424057203242}
purchaseButton: {fileID: 1458252247847964818}
icon: {fileID: 4401845661551908464}
itemName: {fileID: 8536603424255746891}
price: {fileID: 8536603424463105953}
stockCount: {fileID: 8536603422883751234}
--- !u!1 &8536603423534268947
GameObject:
m_ObjectHideFlags: 0
@ -1089,7 +1125,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1317,7 +1353,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:

2473
popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2ceb27afa38c74b76b130f23621f7f50
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

53
popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseButton.cs Normal file
View File

@ -0,0 +1,53 @@
using System;
using UniRx;
using UnityEngine;
using UnityEngine.UI;
public enum ShopItemType
{
Consumable,
NonConsumable,
}
public class ShopItemPurchaseButton : MonoBehaviour
{
private ShopItemType itemType;
[SerializeField] private Button purchaseButton;
[SerializeField] private GameObject onObject;
[SerializeField] private GameObject offObject;
[SerializeField] private GameObject soldOutObject;
public IObservable<Unit> ClickObservable => purchaseButton.OnClickAsObservable().TakeUntilDestroy(this);
public void SetItemType(ShopItemType type)
{
itemType = type;
switch (type)
{
case ShopItemType.Consumable:
soldOutObject.SetActive(false);
break;
case ShopItemType.NonConsumable:
offObject.SetActive(false);
break;
default:
throw new ArgumentOutOfRangeException(nameof(type), type, null);
}
}
public void SetItemActive(bool active)
{
switch (itemType)
{
case ShopItemType.Consumable:
onObject.SetActive(active);
offObject.SetActive(active);
break;
case ShopItemType.NonConsumable:
onObject.SetActive(active);
soldOutObject.SetActive(active);
break;
default:
throw new ArgumentOutOfRangeException();
}
}
}

3
popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseButton.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: f1b7d4e426d24898817abfdca0387221
timeCreated: 1631107148

16
popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs Normal file
View File

@ -0,0 +1,16 @@
using System;
using UniRx;
using UnityEngine;
using UnityEngine.UI;
public class ShopItemView : MonoBehaviour
{
[SerializeField] private Button detailButton;
[SerializeField] private ShopItemPurchaseButton purchaseButton;
[SerializeField] private GameObject icon;
[SerializeField] private Text itemName;
[SerializeField] private Text price;
[SerializeField] private Text stockCount;
public IObservable<Unit> PurchaseButtonObservable => purchaseButton.ClickObservable.TakeUntilDestroy(this);
}

3
popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: bc46478b26ac4ac2a35987667b2e4505
timeCreated: 1631099833

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

File diff suppressed because it is too large Load Diff

24
popcorn/Assets/MyGame/Scripts/ScrollViewSlider.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using UniRx;
using UnityEngine;
using UnityEngine.UI;
public class ScrollViewSlider : MonoBehaviour
{
[SerializeField] private ScrollRect scrollRect;
[SerializeField] private Slider verticalSlider;
private void Start()
{
verticalSlider.direction = Slider.Direction.BottomToTop;
verticalSlider.OnValueChangedAsObservable().Subscribe(x =>
{
scrollRect.verticalNormalizedPosition = x;
}).AddTo(this);
scrollRect.OnValueChangedAsObservable().Subscribe(x =>
{
verticalSlider.value = x.y;
}).AddTo(this);
scrollRect.verticalNormalizedPosition = 1;
}
}

3
popcorn/Assets/MyGame/Scripts/ScrollViewSlider.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4c7fb96966974f86a04af9747989d1f9
timeCreated: 1631112229