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

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

This commit is contained in:
koya_15 2022-10-13 18:40:34 +09:00
parent d1245f619c f7f38de68f
commit 21c0f3313d
5 changed files with 145 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab
View File

@ -308,7 +308,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &145155683095498776
Transform:
m_ObjectHideFlags: 0

5
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab
View File

@ -751,6 +751,11 @@ PrefabInstance:
propertyPath: m_Name
value: egg
objectReference: {fileID: 0}
- target: {fileID: 145155683061950578, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_RootOrder

8
popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs
View File

@ -15,6 +15,7 @@ public class MarketManager : MonoBehaviour
[SerializeField] private MarketView marketView;
[SerializeField] private GameObject closeSign;
private ShopStockView stockView;
[SerializeField] private Transform marketBgTarget;
[SerializeField] private MarketCartView cartView;
[SerializeField] private BrotherBlueView blueView;
[SerializeField] private PartTimerView partTimerView;
@ -51,6 +52,13 @@ public class MarketManager : MonoBehaviour
stockView = marketView.GetTarget(ShopCustomizeCategory.Category4).GetComponentInChildren<ShopStockView>();
stockView.SetTextActive(true);
ShopCustomizeCoinManager.Instance.ChangeCoin(globalGameData.ShopCustomizeCoin);
// 背景
var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet);
var cityData = cityDataList.First(data => data.id == GameDataManager.GameData.CurrentCityId);
marketBgTarget.DestroyAllChildrens();
Instantiate(cityData.GetMarketBgPrefab(), marketBgTarget);
// 最新の都市ではない場合、バイトが有効
if (!market.IsLatestCity)

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

@ -208,6 +208,38 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &69697573
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 69697574}
m_Layer: 0
m_Name: BackGround
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &69697574
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 69697573}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1114986197}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &151001427
GameObject:
m_ObjectHideFlags: 0
@ -2211,7 +2243,7 @@ PrefabInstance:
- target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
@ -2859,7 +2891,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &876376901
GameObject:
@ -3408,7 +3440,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1025201118
MonoBehaviour:
@ -3424,6 +3456,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
marketView: {fileID: 1685069515}
closeSign: {fileID: 2022870421}
marketBgTarget: {fileID: 69697574}
cartView: {fileID: 1119034882}
blueView: {fileID: 1506158581}
partTimerView: {fileID: 1930145619}
@ -3596,6 +3629,12 @@ Transform:
m_Father: {fileID: 760797061}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1114986197 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
m_PrefabInstance: {fileID: 1208500839}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1119034882 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6496262361772707387, guid: 343971e948dfe44ddab5ab4f736c3f06,
@ -3870,6 +3909,80 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1189290112}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1208500839
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 69697574}
m_Modifications:
- target: {fileID: 145155683061950578, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_Name
value: egg (1)
objectReference: {fileID: 0}
- target: {fileID: 145155683061950578, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.28
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.05
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, type: 3}
--- !u!1 &1235629312
GameObject:
m_ObjectHideFlags: 0
@ -4580,7 +4693,7 @@ Transform:
- {fileID: 1178501604}
- {fileID: 1749782974}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1506158581
MonoBehaviour:
@ -9804,7 +9917,7 @@ PrefabInstance:
- target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
type: 3}
@ -9866,6 +9979,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6725113440112460160, guid: 343971e948dfe44ddab5ab4f736c3f06,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3}
--- !u!114 &1685069515 stripped
@ -15334,7 +15452,7 @@ Transform:
- {fileID: 1312496084}
- {fileID: 1078117066}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1930145619
MonoBehaviour:
@ -15382,7 +15500,7 @@ Transform:
- {fileID: 172087640}
- {fileID: 985747655}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2022870421 stripped
GameObject:
@ -15533,7 +15651,7 @@ PrefabInstance:
- target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e,
type: 3}

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

@ -633,6 +633,11 @@ public sealed class CityData
{
return Resources.Load<Transform>($"CityIcons/{prefabName}");
}
public Transform GetMarketBgPrefab()
{
return Resources.Load<Transform>($"ShopCityBackground/{prefabName}");
}
}
[Serializable]