調理中背景の切り替え対応
This commit is contained in:
parent
673638aa8a
commit
97bc39434a
|
|
@ -362,12 +362,6 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 156418749}
|
m_GameObject: {fileID: 156418749}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
--- !u!4 &162168170 stripped
|
|
||||||
Transform:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 8720810031687078333}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!4 &189605846 stripped
|
--- !u!4 &189605846 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 6178100819148698325, guid: 8a9bb5b0ba05a4ff39d47fe47121e433,
|
m_CorrespondingSourceObject: {fileID: 6178100819148698325, guid: 8a9bb5b0ba05a4ff39d47fe47121e433,
|
||||||
|
|
@ -2216,12 +2210,6 @@ Transform:
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 715927680}
|
m_PrefabInstance: {fileID: 715927680}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &779475523 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 8720810032052751358, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 8720810031687078333}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &785034261
|
--- !u!1 &785034261
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2277,6 +2265,38 @@ Animator:
|
||||||
m_HasTransformHierarchy: 1
|
m_HasTransformHierarchy: 1
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
m_KeepAnimatorControllerStateOnDisable: 0
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
|
--- !u!1 &820439929
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 820439930}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: BgTarget
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &820439930
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 820439929}
|
||||||
|
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: 1129457738}
|
||||||
|
m_Father: {fileID: 1448897407}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &851501627
|
--- !u!114 &851501627
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -3615,9 +3635,8 @@ Transform:
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1095273985}
|
- {fileID: 1095273985}
|
||||||
- {fileID: 1129457738}
|
- {fileID: 820439930}
|
||||||
- {fileID: 1295632043}
|
- {fileID: 1295632043}
|
||||||
- {fileID: 162168170}
|
|
||||||
- {fileID: 1528220821}
|
- {fileID: 1528220821}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
|
|
@ -3818,7 +3837,7 @@ Transform:
|
||||||
- {fileID: 8324835}
|
- {fileID: 8324835}
|
||||||
- {fileID: 1306295627}
|
- {fileID: 1306295627}
|
||||||
m_Father: {fileID: 1448897407}
|
m_Father: {fileID: 1448897407}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &1528220822
|
--- !u!114 &1528220822
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
@ -3840,12 +3859,6 @@ Transform:
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 3304524445743452218}
|
m_PrefabInstance: {fileID: 3304524445743452218}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &1564034574 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 8720810030160828339, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 8720810031687078333}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &1585657223
|
--- !u!1 &1585657223
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4411,6 +4424,7 @@ MonoBehaviour:
|
||||||
cornManager: {fileID: 1870432536}
|
cornManager: {fileID: 1870432536}
|
||||||
panColliderChanger: {fileID: 2137549896}
|
panColliderChanger: {fileID: 2137549896}
|
||||||
toppingView: {fileID: 1528220822}
|
toppingView: {fileID: 1528220822}
|
||||||
|
cityBackGroundTarget: {fileID: 820439930}
|
||||||
gameProgress: 0
|
gameProgress: 0
|
||||||
resultDelay: 1.8
|
resultDelay: 1.8
|
||||||
--- !u!4 &1870432534
|
--- !u!4 &1870432534
|
||||||
|
|
@ -4506,8 +4520,8 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
startingGuide: {fileID: 8677286139723025160}
|
startingGuide: {fileID: 8677286139723025160}
|
||||||
onToggle: {fileID: 1564034574}
|
onToggle: {fileID: 0}
|
||||||
offToggle: {fileID: 779475523}
|
offToggle: {fileID: 0}
|
||||||
fire: {fileID: 1295632042}
|
fire: {fileID: 1295632042}
|
||||||
oilEffect: {fileID: 2137549894}
|
oilEffect: {fileID: 2137549894}
|
||||||
streamEffect: {fileID: 2137549893}
|
streamEffect: {fileID: 2137549893}
|
||||||
|
|
@ -6006,12 +6020,12 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 1448897407}
|
m_TransformParent: {fileID: 820439930}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -6036,17 +6050,17 @@ PrefabInstance:
|
||||||
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalRotation.x
|
propertyPath: m_LocalRotation.x
|
||||||
value: 0
|
value: -0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalRotation.y
|
propertyPath: m_LocalRotation.y
|
||||||
value: 0
|
value: -0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalRotation.z
|
propertyPath: m_LocalRotation.z
|
||||||
value: 0
|
value: -0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
- target: {fileID: 8226655026795209300, guid: 3e570ad87cce2044b90987a18ee107e6,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -6068,11 +6082,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: egg
|
value: egg
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8226655026795209303, guid: 3e570ad87cce2044b90987a18ee107e6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_IsActive
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 3e570ad87cce2044b90987a18ee107e6, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 3e570ad87cce2044b90987a18ee107e6, type: 3}
|
||||||
--- !u!1 &8677286139723025160
|
--- !u!1 &8677286139723025160
|
||||||
|
|
@ -6091,72 +6100,3 @@ GameObject:
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!1001 &8720810031687078333
|
|
||||||
PrefabInstance:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Modification:
|
|
||||||
m_TransformParent: {fileID: 1448897407}
|
|
||||||
m_Modifications:
|
|
||||||
- target: {fileID: 8720810031579491540, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: Stove_egg
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_RootOrder
|
|
||||||
value: 3
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: -0.7
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.w
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8720810031579491543, guid: 212311f8f2d546440b617b17fd52e2c7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 212311f8f2d546440b617b17fd52e2c7, type: 3}
|
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ public class PopcornGameManager : MonoBehaviour
|
||||||
[SerializeField] private CornManager cornManager;
|
[SerializeField] private CornManager cornManager;
|
||||||
[SerializeField] private PanColliderChanger panColliderChanger;
|
[SerializeField] private PanColliderChanger panColliderChanger;
|
||||||
[SerializeField] private ToppingView toppingView;
|
[SerializeField] private ToppingView toppingView;
|
||||||
|
[SerializeField] private Transform cityBackGroundTarget;
|
||||||
|
|
||||||
[Space]
|
[Space]
|
||||||
[SerializeField, ReadOnly] private float gameProgress;
|
[SerializeField, ReadOnly] private float gameProgress;
|
||||||
|
|
@ -48,6 +49,12 @@ public class PopcornGameManager : MonoBehaviour
|
||||||
|
|
||||||
SoundManager.Instance.PlayBGM("bgm_cooking");
|
SoundManager.Instance.PlayBGM("bgm_cooking");
|
||||||
|
|
||||||
|
// 背景
|
||||||
|
var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet);
|
||||||
|
var cityData = cityDataList.First(data => data.id == GameDataManager.GameData.CurrentCityId);
|
||||||
|
cityBackGroundTarget.DestroyAllChildrens();
|
||||||
|
Instantiate(cityData.GetCornFieldBgPrefab(), cityBackGroundTarget);
|
||||||
|
|
||||||
thermalControl.Condition.Subscribe(x =>
|
thermalControl.Condition.Subscribe(x =>
|
||||||
{
|
{
|
||||||
cornManager.ChangeGrowSpeed(x);
|
cornManager.ChangeGrowSpeed(x);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue