大量注文処理追加
This commit is contained in:
		
							parent
							
								
									34440384a5
								
							
						
					
					
						commit
						4f25312cef
					
				|  | @ -4630,7 +4630,7 @@ PrefabInstance: | ||||||
|     - target: {fileID: 3832433339922076370, guid: caaa748dbeed576499e8cae74d33f689, |     - target: {fileID: 3832433339922076370, guid: caaa748dbeed576499e8cae74d33f689, | ||||||
|         type: 3} |         type: 3} | ||||||
|       propertyPath: m_IsActive |       propertyPath: m_IsActive | ||||||
|       value: 0 |       value: 1 | ||||||
|       objectReference: {fileID: 0} |       objectReference: {fileID: 0} | ||||||
|     - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, |     - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, | ||||||
|         type: 3} |         type: 3} | ||||||
|  | @ -4642,6 +4642,21 @@ PrefabInstance: | ||||||
|       propertyPath: m_IsActive |       propertyPath: m_IsActive | ||||||
|       value: 1 |       value: 1 | ||||||
|       objectReference: {fileID: 0} |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 7252061863213906723, guid: caaa748dbeed576499e8cae74d33f689, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_Transition | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 7252061863213906723, guid: caaa748dbeed576499e8cae74d33f689, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_Interactable | ||||||
|  |       value: 1 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 7387931604440686042, guid: caaa748dbeed576499e8cae74d33f689, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_IsActive | ||||||
|  |       value: 1 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|     m_RemovedComponents: [] |     m_RemovedComponents: [] | ||||||
|   m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} |   m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} | ||||||
| --- !u!224 &3664916832445709978 stripped | --- !u!224 &3664916832445709978 stripped | ||||||
|  |  | ||||||
|  | @ -1012,6 +1012,7 @@ GameObject: | ||||||
|   serializedVersion: 6 |   serializedVersion: 6 | ||||||
|   m_Component: |   m_Component: | ||||||
|   - component: {fileID: 4082915278546610718} |   - component: {fileID: 4082915278546610718} | ||||||
|  |   - component: {fileID: 2145851308931691871} | ||||||
|   m_Layer: 5 |   m_Layer: 5 | ||||||
|   m_Name: Window |   m_Name: Window | ||||||
|   m_TagString: Untagged |   m_TagString: Untagged | ||||||
|  | @ -1041,6 +1042,29 @@ RectTransform: | ||||||
|   m_AnchoredPosition: {x: 0, y: 52} |   m_AnchoredPosition: {x: 0, y: 52} | ||||||
|   m_SizeDelta: {x: 922, y: 1700} |   m_SizeDelta: {x: 922, y: 1700} | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
|  | --- !u!114 &2145851308931691871 | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 4082915278546610719} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: 5dcfec9a112d409796b81c96710930a6, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
|  |   backgroundAnimator: {fileID: 4082915279313483617} | ||||||
|  |   closeButton: {fileID: 4082915278992014893} | ||||||
|  |   cancelButton: {fileID: 4082915278942985871} | ||||||
|  |   deliveredButton: {fileID: 4082915279019759811} | ||||||
|  |   achievedObject: {fileID: 4082915278879672978} | ||||||
|  |   messageText: {fileID: 4082915277970689977} | ||||||
|  |   coinText: {fileID: 4082915277569352110} | ||||||
|  |   heartText: {fileID: 4082915279101330553} | ||||||
|  |   itemView1: {fileID: 7927160839000454040} | ||||||
|  |   itemView2: {fileID: 6685489803199069635} | ||||||
|  |   itemView3: {fileID: 6685489803297445835} | ||||||
| --- !u!1 &4082915278807493231 | --- !u!1 &4082915278807493231 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -2582,6 +2606,18 @@ PrefabInstance: | ||||||
|       objectReference: {fileID: 0} |       objectReference: {fileID: 0} | ||||||
|     m_RemovedComponents: [] |     m_RemovedComponents: [] | ||||||
|   m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} |   m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} | ||||||
|  | --- !u!114 &7927160839000454040 stripped | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 7236946357327453438, guid: 72c4a5536cad64c4aa959dccbff86e18, | ||||||
|  |     type: 3} | ||||||
|  |   m_PrefabInstance: {fileID: 751013265656328038} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 0} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: ab9ddab5084248d68b0cb2c53c8dc7cc, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
| --- !u!224 &6299910495887276473 stripped | --- !u!224 &6299910495887276473 stripped | ||||||
| RectTransform: | RectTransform: | ||||||
|   m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, |   m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, | ||||||
|  | @ -2707,6 +2743,18 @@ PrefabInstance: | ||||||
|       objectReference: {fileID: 0} |       objectReference: {fileID: 0} | ||||||
|     m_RemovedComponents: [] |     m_RemovedComponents: [] | ||||||
|   m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} |   m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} | ||||||
|  | --- !u!114 &6685489803199069635 stripped | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 7236946357327453438, guid: 72c4a5536cad64c4aa959dccbff86e18, | ||||||
|  |     type: 3} | ||||||
|  |   m_PrefabInstance: {fileID: 4082915279223546173} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 0} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: ab9ddab5084248d68b0cb2c53c8dc7cc, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
| --- !u!224 &7325254816105691106 stripped | --- !u!224 &7325254816105691106 stripped | ||||||
| RectTransform: | RectTransform: | ||||||
|   m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, |   m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, | ||||||
|  | @ -2832,6 +2880,18 @@ PrefabInstance: | ||||||
|       objectReference: {fileID: 0} |       objectReference: {fileID: 0} | ||||||
|     m_RemovedComponents: [] |     m_RemovedComponents: [] | ||||||
|   m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} |   m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} | ||||||
|  | --- !u!114 &6685489803297445835 stripped | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 7236946357327453438, guid: 72c4a5536cad64c4aa959dccbff86e18, | ||||||
|  |     type: 3} | ||||||
|  |   m_PrefabInstance: {fileID: 4082915279389395765} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 0} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: ab9ddab5084248d68b0cb2c53c8dc7cc, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
| --- !u!224 &7325254816271539690 stripped | --- !u!224 &7325254816271539690 stripped | ||||||
| RectTransform: | RectTransform: | ||||||
|   m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, |   m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, | ||||||
|  |  | ||||||
|  | @ -254,6 +254,7 @@ RectTransform: | ||||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|   m_LocalScale: {x: 0, y: 0, z: 0} |   m_LocalScale: {x: 0, y: 0, z: 0} | ||||||
|   m_Children: |   m_Children: | ||||||
|  |   - {fileID: 4187074209901625002} | ||||||
|   - {fileID: 4187074209752017942} |   - {fileID: 4187074209752017942} | ||||||
|   m_Father: {fileID: 0} |   m_Father: {fileID: 0} | ||||||
|   m_RootOrder: 0 |   m_RootOrder: 0 | ||||||
|  | @ -1135,6 +1136,7 @@ GameObject: | ||||||
|   serializedVersion: 6 |   serializedVersion: 6 | ||||||
|   m_Component: |   m_Component: | ||||||
|   - component: {fileID: 4187074209752017942} |   - component: {fileID: 4187074209752017942} | ||||||
|  |   - component: {fileID: 594854296290337299} | ||||||
|   m_Layer: 5 |   m_Layer: 5 | ||||||
|   m_Name: Window |   m_Name: Window | ||||||
|   m_TagString: Untagged |   m_TagString: Untagged | ||||||
|  | @ -1153,17 +1155,33 @@ RectTransform: | ||||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|   m_LocalScale: {x: 1, y: 1, z: 1} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 4187074209901625002} |  | ||||||
|   - {fileID: 4187074210113349099} |   - {fileID: 4187074210113349099} | ||||||
|   - {fileID: 4187074209910267576} |   - {fileID: 4187074209910267576} | ||||||
|   m_Father: {fileID: 4187074209012466685} |   m_Father: {fileID: 4187074209012466685} | ||||||
|   m_RootOrder: 0 |   m_RootOrder: 1 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|   m_AnchoredPosition: {x: 0, y: 0} |   m_AnchoredPosition: {x: 0, y: 0} | ||||||
|   m_SizeDelta: {x: 705, y: 705} |   m_SizeDelta: {x: 705, y: 705} | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
|  | --- !u!114 &594854296290337299 | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 4187074209752017943} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: 3bace6e100bf4e3a8059828acdc02e1b, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
|  |   backgroundAnimator: {fileID: 4187074209901625005} | ||||||
|  |   closeButton: {fileID: 4187074209291994452} | ||||||
|  |   cancelButton: {fileID: 4187074209150459463} | ||||||
|  |   coinText: {fileID: 4187074209543196534} | ||||||
|  |   heartText: {fileID: 4187074210139745722} | ||||||
| --- !u!1 &4187074209901625003 | --- !u!1 &4187074209901625003 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -1190,11 +1208,11 @@ RectTransform: | ||||||
|   m_PrefabInstance: {fileID: 0} |   m_PrefabInstance: {fileID: 0} | ||||||
|   m_PrefabAsset: {fileID: 0} |   m_PrefabAsset: {fileID: 0} | ||||||
|   m_GameObject: {fileID: 4187074209901625003} |   m_GameObject: {fileID: 4187074209901625003} | ||||||
|   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|   m_LocalScale: {x: 1, y: 1, z: 1} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: [] |   m_Children: [] | ||||||
|   m_Father: {fileID: 4187074209752017942} |   m_Father: {fileID: 4187074209012466685} | ||||||
|   m_RootOrder: 0 |   m_RootOrder: 0 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|  | @ -1224,7 +1242,7 @@ MonoBehaviour: | ||||||
|   m_EditorClassIdentifier:  |   m_EditorClassIdentifier:  | ||||||
|   m_Material: {fileID: 0} |   m_Material: {fileID: 0} | ||||||
|   m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843} |   m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843} | ||||||
|   m_RaycastTarget: 0 |   m_RaycastTarget: 1 | ||||||
|   m_Maskable: 1 |   m_Maskable: 1 | ||||||
|   m_OnCullStateChanged: |   m_OnCullStateChanged: | ||||||
|     m_PersistentCalls: |     m_PersistentCalls: | ||||||
|  | @ -1292,7 +1310,7 @@ RectTransform: | ||||||
|   - {fileID: 4187074209998286564} |   - {fileID: 4187074209998286564} | ||||||
|   - {fileID: 4187074209382484540} |   - {fileID: 4187074209382484540} | ||||||
|   m_Father: {fileID: 4187074209752017942} |   m_Father: {fileID: 4187074209752017942} | ||||||
|   m_RootOrder: 2 |   m_RootOrder: 1 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0, y: 0} |   m_AnchorMin: {x: 0, y: 0} | ||||||
|   m_AnchorMax: {x: 1, y: 1} |   m_AnchorMax: {x: 1, y: 1} | ||||||
|  | @ -1454,7 +1472,7 @@ RectTransform: | ||||||
|   m_LocalScale: {x: 1, y: 1, z: 1} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: [] |   m_Children: [] | ||||||
|   m_Father: {fileID: 4187074209752017942} |   m_Father: {fileID: 4187074209752017942} | ||||||
|   m_RootOrder: 1 |   m_RootOrder: 0 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  |  | ||||||
|  | @ -33,7 +33,7 @@ RectTransform: | ||||||
|   - {fileID: 4315754687736309292} |   - {fileID: 4315754687736309292} | ||||||
|   - {fileID: 4315754687099534943} |   - {fileID: 4315754687099534943} | ||||||
|   m_Father: {fileID: 4315754686943043844} |   m_Father: {fileID: 4315754686943043844} | ||||||
|   m_RootOrder: 3 |   m_RootOrder: 2 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  | @ -361,6 +361,7 @@ GameObject: | ||||||
|   serializedVersion: 6 |   serializedVersion: 6 | ||||||
|   m_Component: |   m_Component: | ||||||
|   - component: {fileID: 4315754686943043844} |   - component: {fileID: 4315754686943043844} | ||||||
|  |   - component: {fileID: 9217531184726761281} | ||||||
|   m_Layer: 5 |   m_Layer: 5 | ||||||
|   m_Name: Window |   m_Name: Window | ||||||
|   m_TagString: Untagged |   m_TagString: Untagged | ||||||
|  | @ -379,18 +380,37 @@ RectTransform: | ||||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|   m_LocalScale: {x: 1, y: 1, z: 1} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 4315754688243439425} |  | ||||||
|   - {fileID: 4315754687931289281} |   - {fileID: 4315754687931289281} | ||||||
|   - {fileID: 4315754687733902321} |   - {fileID: 4315754687733902321} | ||||||
|   - {fileID: 4315754686536851282} |   - {fileID: 4315754686536851282} | ||||||
|   m_Father: {fileID: 4315754687615340680} |   m_Father: {fileID: 4315754687615340680} | ||||||
|   m_RootOrder: 0 |   m_RootOrder: 1 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|   m_AnchoredPosition: {x: 0, y: 0} |   m_AnchoredPosition: {x: 0, y: 0} | ||||||
|   m_SizeDelta: {x: 705, y: 794} |   m_SizeDelta: {x: 705, y: 794} | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
|  | --- !u!114 &9217531184726761281 | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 4315754686943043847} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: aedda4da1f224450ad6f9b196e8e7e7d, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
|  |   backgroundAnimator: {fileID: 4315754688243439430} | ||||||
|  |   closeButton: {fileID: 4315754687626831810} | ||||||
|  |   messageText: {fileID: 4315754687599301553} | ||||||
|  |   itemView1: {fileID: 706922748529613437} | ||||||
|  |   itemView2: {fileID: 1755114094130154674} | ||||||
|  |   itemView3: {fileID: 1755114094215964333} | ||||||
|  |   coinText: {fileID: 4315754686580462760} | ||||||
|  |   heartText: {fileID: 4315754688005591447} | ||||||
| --- !u!1 &4315754687099534942 | --- !u!1 &4315754687099534942 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -764,6 +784,7 @@ RectTransform: | ||||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|   m_LocalScale: {x: 0, y: 0, z: 0} |   m_LocalScale: {x: 0, y: 0, z: 0} | ||||||
|   m_Children: |   m_Children: | ||||||
|  |   - {fileID: 4315754688243439425} | ||||||
|   - {fileID: 4315754686943043844} |   - {fileID: 4315754686943043844} | ||||||
|   m_Father: {fileID: 0} |   m_Father: {fileID: 0} | ||||||
|   m_RootOrder: 0 |   m_RootOrder: 0 | ||||||
|  | @ -1002,7 +1023,7 @@ RectTransform: | ||||||
|   - {fileID: 4315754687599301552} |   - {fileID: 4315754687599301552} | ||||||
|   - {fileID: 4315754686575543076} |   - {fileID: 4315754686575543076} | ||||||
|   m_Father: {fileID: 4315754686943043844} |   m_Father: {fileID: 4315754686943043844} | ||||||
|   m_RootOrder: 2 |   m_RootOrder: 1 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  | @ -1153,7 +1174,7 @@ RectTransform: | ||||||
|   m_LocalScale: {x: 1, y: 1, z: 1} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: [] |   m_Children: [] | ||||||
|   m_Father: {fileID: 4315754686943043844} |   m_Father: {fileID: 4315754686943043844} | ||||||
|   m_RootOrder: 1 |   m_RootOrder: 0 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  | @ -1451,11 +1472,11 @@ RectTransform: | ||||||
|   m_PrefabInstance: {fileID: 0} |   m_PrefabInstance: {fileID: 0} | ||||||
|   m_PrefabAsset: {fileID: 0} |   m_PrefabAsset: {fileID: 0} | ||||||
|   m_GameObject: {fileID: 4315754688243439424} |   m_GameObject: {fileID: 4315754688243439424} | ||||||
|   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|   m_LocalScale: {x: 1, y: 1, z: 1} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: [] |   m_Children: [] | ||||||
|   m_Father: {fileID: 4315754686943043844} |   m_Father: {fileID: 4315754687615340680} | ||||||
|   m_RootOrder: 0 |   m_RootOrder: 0 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|  | @ -1485,7 +1506,7 @@ MonoBehaviour: | ||||||
|   m_EditorClassIdentifier:  |   m_EditorClassIdentifier:  | ||||||
|   m_Material: {fileID: 0} |   m_Material: {fileID: 0} | ||||||
|   m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843} |   m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843} | ||||||
|   m_RaycastTarget: 0 |   m_RaycastTarget: 1 | ||||||
|   m_Maskable: 1 |   m_Maskable: 1 | ||||||
|   m_OnCullStateChanged: |   m_OnCullStateChanged: | ||||||
|     m_PersistentCalls: |     m_PersistentCalls: | ||||||
|  | @ -1792,6 +1813,18 @@ RectTransform: | ||||||
|     type: 3} |     type: 3} | ||||||
|   m_PrefabInstance: {fileID: 3058138225154535967} |   m_PrefabInstance: {fileID: 3058138225154535967} | ||||||
|   m_PrefabAsset: {fileID: 0} |   m_PrefabAsset: {fileID: 0} | ||||||
|  | --- !u!114 &706922748529613437 stripped | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, | ||||||
|  |     type: 3} | ||||||
|  |   m_PrefabInstance: {fileID: 3058138225154535967} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 0} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
| --- !u!1001 &4315754688263163599 | --- !u!1001 &4315754688263163599 | ||||||
| PrefabInstance: | PrefabInstance: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -1927,6 +1960,18 @@ RectTransform: | ||||||
|     type: 3} |     type: 3} | ||||||
|   m_PrefabInstance: {fileID: 4315754688263163599} |   m_PrefabInstance: {fileID: 4315754688263163599} | ||||||
|   m_PrefabAsset: {fileID: 0} |   m_PrefabAsset: {fileID: 0} | ||||||
|  | --- !u!114 &1755114094215964333 stripped | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, | ||||||
|  |     type: 3} | ||||||
|  |   m_PrefabInstance: {fileID: 4315754688263163599} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 0} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
| --- !u!1001 &4315754688290612432 | --- !u!1001 &4315754688290612432 | ||||||
| PrefabInstance: | PrefabInstance: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -2052,3 +2097,15 @@ RectTransform: | ||||||
|     type: 3} |     type: 3} | ||||||
|   m_PrefabInstance: {fileID: 4315754688290612432} |   m_PrefabInstance: {fileID: 4315754688290612432} | ||||||
|   m_PrefabAsset: {fileID: 0} |   m_PrefabAsset: {fileID: 0} | ||||||
|  | --- !u!114 &1755114094130154674 stripped | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, | ||||||
|  |     type: 3} | ||||||
|  |   m_PrefabInstance: {fileID: 4315754688290612432} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 0} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
|  |  | ||||||
|  | @ -74,6 +74,80 @@ MonoBehaviour: | ||||||
|   m_FillOrigin: 0 |   m_FillOrigin: 0 | ||||||
|   m_UseSpriteMesh: 0 |   m_UseSpriteMesh: 0 | ||||||
|   m_PixelsPerUnitMultiplier: 1 |   m_PixelsPerUnitMultiplier: 1 | ||||||
|  | --- !u!1 &1218025997047797446 | ||||||
|  | GameObject: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   serializedVersion: 6 | ||||||
|  |   m_Component: | ||||||
|  |   - component: {fileID: 7601727368869576156} | ||||||
|  |   - component: {fileID: 5790060652346577943} | ||||||
|  |   - component: {fileID: 6795331204195132790} | ||||||
|  |   m_Layer: 0 | ||||||
|  |   m_Name: package | ||||||
|  |   m_TagString: Untagged | ||||||
|  |   m_Icon: {fileID: 0} | ||||||
|  |   m_NavMeshLayer: 0 | ||||||
|  |   m_StaticEditorFlags: 0 | ||||||
|  |   m_IsActive: 1 | ||||||
|  | --- !u!224 &7601727368869576156 | ||||||
|  | RectTransform: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 1218025997047797446} | ||||||
|  |   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: 6701890202353341293} | ||||||
|  |   m_RootOrder: 0 | ||||||
|  |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|  |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|  |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  |   m_AnchoredPosition: {x: 0, y: 0} | ||||||
|  |   m_SizeDelta: {x: 92, y: 136} | ||||||
|  |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
|  | --- !u!222 &5790060652346577943 | ||||||
|  | CanvasRenderer: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 1218025997047797446} | ||||||
|  |   m_CullTransparentMesh: 0 | ||||||
|  | --- !u!114 &6795331204195132790 | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 1218025997047797446} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
|  |   m_Material: {fileID: 0} | ||||||
|  |   m_Color: {r: 1, g: 1, b: 1, a: 1} | ||||||
|  |   m_RaycastTarget: 0 | ||||||
|  |   m_Maskable: 1 | ||||||
|  |   m_OnCullStateChanged: | ||||||
|  |     m_PersistentCalls: | ||||||
|  |       m_Calls: [] | ||||||
|  |   m_Sprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, type: 3} | ||||||
|  |   m_Type: 0 | ||||||
|  |   m_PreserveAspect: 0 | ||||||
|  |   m_FillCenter: 1 | ||||||
|  |   m_FillMethod: 4 | ||||||
|  |   m_FillAmount: 1 | ||||||
|  |   m_FillClockwise: 1 | ||||||
|  |   m_FillOrigin: 0 | ||||||
|  |   m_UseSpriteMesh: 0 | ||||||
|  |   m_PixelsPerUnitMultiplier: 1 | ||||||
| --- !u!1 &1516465686560891674 | --- !u!1 &1516465686560891674 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -264,80 +338,6 @@ RectTransform: | ||||||
|   m_AnchoredPosition: {x: 32, y: -34.2} |   m_AnchoredPosition: {x: 32, y: -34.2} | ||||||
|   m_SizeDelta: {x: 56, y: 56} |   m_SizeDelta: {x: 56, y: 56} | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
| --- !u!1 &2570188224453656030 |  | ||||||
| GameObject: |  | ||||||
|   m_ObjectHideFlags: 0 |  | ||||||
|   m_CorrespondingSourceObject: {fileID: 0} |  | ||||||
|   m_PrefabInstance: {fileID: 0} |  | ||||||
|   m_PrefabAsset: {fileID: 0} |  | ||||||
|   serializedVersion: 6 |  | ||||||
|   m_Component: |  | ||||||
|   - component: {fileID: 8361475802832570378} |  | ||||||
|   - component: {fileID: 7721757012747742433} |  | ||||||
|   - component: {fileID: 5866187155139017820} |  | ||||||
|   m_Layer: 5 |  | ||||||
|   m_Name: rare |  | ||||||
|   m_TagString: Untagged |  | ||||||
|   m_Icon: {fileID: 0} |  | ||||||
|   m_NavMeshLayer: 0 |  | ||||||
|   m_StaticEditorFlags: 0 |  | ||||||
|   m_IsActive: 1 |  | ||||||
| --- !u!224 &8361475802832570378 |  | ||||||
| RectTransform: |  | ||||||
|   m_ObjectHideFlags: 0 |  | ||||||
|   m_CorrespondingSourceObject: {fileID: 0} |  | ||||||
|   m_PrefabInstance: {fileID: 0} |  | ||||||
|   m_PrefabAsset: {fileID: 0} |  | ||||||
|   m_GameObject: {fileID: 2570188224453656030} |  | ||||||
|   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: 3658417434568161581} |  | ||||||
|   m_RootOrder: 1 |  | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |  | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |  | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |  | ||||||
|   m_AnchoredPosition: {x: 0, y: -37.5} |  | ||||||
|   m_SizeDelta: {x: 34, y: 34} |  | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |  | ||||||
| --- !u!222 &7721757012747742433 |  | ||||||
| CanvasRenderer: |  | ||||||
|   m_ObjectHideFlags: 0 |  | ||||||
|   m_CorrespondingSourceObject: {fileID: 0} |  | ||||||
|   m_PrefabInstance: {fileID: 0} |  | ||||||
|   m_PrefabAsset: {fileID: 0} |  | ||||||
|   m_GameObject: {fileID: 2570188224453656030} |  | ||||||
|   m_CullTransparentMesh: 0 |  | ||||||
| --- !u!114 &5866187155139017820 |  | ||||||
| MonoBehaviour: |  | ||||||
|   m_ObjectHideFlags: 0 |  | ||||||
|   m_CorrespondingSourceObject: {fileID: 0} |  | ||||||
|   m_PrefabInstance: {fileID: 0} |  | ||||||
|   m_PrefabAsset: {fileID: 0} |  | ||||||
|   m_GameObject: {fileID: 2570188224453656030} |  | ||||||
|   m_Enabled: 1 |  | ||||||
|   m_EditorHideFlags: 0 |  | ||||||
|   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |  | ||||||
|   m_Name:  |  | ||||||
|   m_EditorClassIdentifier:  |  | ||||||
|   m_Material: {fileID: 0} |  | ||||||
|   m_Color: {r: 1, g: 1, b: 1, a: 1} |  | ||||||
|   m_RaycastTarget: 0 |  | ||||||
|   m_Maskable: 1 |  | ||||||
|   m_OnCullStateChanged: |  | ||||||
|     m_PersistentCalls: |  | ||||||
|       m_Calls: [] |  | ||||||
|   m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} |  | ||||||
|   m_Type: 0 |  | ||||||
|   m_PreserveAspect: 0 |  | ||||||
|   m_FillCenter: 1 |  | ||||||
|   m_FillMethod: 4 |  | ||||||
|   m_FillAmount: 1 |  | ||||||
|   m_FillClockwise: 1 |  | ||||||
|   m_FillOrigin: 0 |  | ||||||
|   m_UseSpriteMesh: 0 |  | ||||||
|   m_PixelsPerUnitMultiplier: 1 |  | ||||||
| --- !u!1 &2679656543278342664 | --- !u!1 &2679656543278342664 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -765,7 +765,7 @@ RectTransform: | ||||||
|   m_LocalScale: {x: 1, y: 1, z: 1} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 3658417434518209427} |   - {fileID: 3658417434518209427} | ||||||
|   - {fileID: 8361475802832570378} |   - {fileID: 5676996117682643678} | ||||||
|   m_Father: {fileID: 3658417435631091038} |   m_Father: {fileID: 3658417435631091038} | ||||||
|   m_RootOrder: 1 |   m_RootOrder: 1 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|  | @ -1157,8 +1157,6 @@ GameObject: | ||||||
|   serializedVersion: 6 |   serializedVersion: 6 | ||||||
|   m_Component: |   m_Component: | ||||||
|   - component: {fileID: 6701890202353341293} |   - component: {fileID: 6701890202353341293} | ||||||
|   - component: {fileID: 6701890202353341283} |  | ||||||
|   - component: {fileID: 6701890202353341282} |  | ||||||
|   m_Layer: 0 |   m_Layer: 0 | ||||||
|   m_Name: popcorn |   m_Name: popcorn | ||||||
|   m_TagString: Untagged |   m_TagString: Untagged | ||||||
|  | @ -1176,7 +1174,8 @@ RectTransform: | ||||||
|   m_LocalRotation: {x: -0, y: -0, z: -0.06725802, w: 0.9977356} |   m_LocalRotation: {x: -0, y: -0, z: -0.06725802, w: 0.9977356} | ||||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|   m_LocalScale: {x: 0.90000015, y: 0.90000015, z: 0.9} |   m_LocalScale: {x: 0.90000015, y: 0.90000015, z: 0.9} | ||||||
|   m_Children: [] |   m_Children: | ||||||
|  |   - {fileID: 7601727368869576156} | ||||||
|   m_Father: {fileID: 5841854344991296691} |   m_Father: {fileID: 5841854344991296691} | ||||||
|   m_RootOrder: 1 |   m_RootOrder: 1 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7130003} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7130003} | ||||||
|  | @ -1185,43 +1184,6 @@ RectTransform: | ||||||
|   m_AnchoredPosition: {x: -231, y: -10} |   m_AnchoredPosition: {x: -231, y: -10} | ||||||
|   m_SizeDelta: {x: 92, y: 136} |   m_SizeDelta: {x: 92, y: 136} | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
| --- !u!222 &6701890202353341283 |  | ||||||
| CanvasRenderer: |  | ||||||
|   m_ObjectHideFlags: 0 |  | ||||||
|   m_CorrespondingSourceObject: {fileID: 0} |  | ||||||
|   m_PrefabInstance: {fileID: 0} |  | ||||||
|   m_PrefabAsset: {fileID: 0} |  | ||||||
|   m_GameObject: {fileID: 6701890202353341292} |  | ||||||
|   m_CullTransparentMesh: 0 |  | ||||||
| --- !u!114 &6701890202353341282 |  | ||||||
| MonoBehaviour: |  | ||||||
|   m_ObjectHideFlags: 0 |  | ||||||
|   m_CorrespondingSourceObject: {fileID: 0} |  | ||||||
|   m_PrefabInstance: {fileID: 0} |  | ||||||
|   m_PrefabAsset: {fileID: 0} |  | ||||||
|   m_GameObject: {fileID: 6701890202353341292} |  | ||||||
|   m_Enabled: 1 |  | ||||||
|   m_EditorHideFlags: 0 |  | ||||||
|   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |  | ||||||
|   m_Name:  |  | ||||||
|   m_EditorClassIdentifier:  |  | ||||||
|   m_Material: {fileID: 0} |  | ||||||
|   m_Color: {r: 1, g: 1, b: 1, a: 1} |  | ||||||
|   m_RaycastTarget: 0 |  | ||||||
|   m_Maskable: 1 |  | ||||||
|   m_OnCullStateChanged: |  | ||||||
|     m_PersistentCalls: |  | ||||||
|       m_Calls: [] |  | ||||||
|   m_Sprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, type: 3} |  | ||||||
|   m_Type: 0 |  | ||||||
|   m_PreserveAspect: 0 |  | ||||||
|   m_FillCenter: 1 |  | ||||||
|   m_FillMethod: 4 |  | ||||||
|   m_FillAmount: 1 |  | ||||||
|   m_FillClockwise: 1 |  | ||||||
|   m_FillOrigin: 0 |  | ||||||
|   m_UseSpriteMesh: 0 |  | ||||||
|   m_PixelsPerUnitMultiplier: 1 |  | ||||||
| --- !u!1 &6701890202664346912 | --- !u!1 &6701890202664346912 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -1498,7 +1460,7 @@ GameObject: | ||||||
|   serializedVersion: 6 |   serializedVersion: 6 | ||||||
|   m_Component: |   m_Component: | ||||||
|   - component: {fileID: 6701890203127158495} |   - component: {fileID: 6701890203127158495} | ||||||
|   - component: {fileID: 4150581692906928959} |   - component: {fileID: 7236946357327453438} | ||||||
|   m_Layer: 0 |   m_Layer: 0 | ||||||
|   m_Name: Frame_BulkOrder |   m_Name: Frame_BulkOrder | ||||||
|   m_TagString: Untagged |   m_TagString: Untagged | ||||||
|  | @ -1526,7 +1488,7 @@ RectTransform: | ||||||
|   m_AnchoredPosition: {x: 0, y: 0} |   m_AnchoredPosition: {x: 0, y: 0} | ||||||
|   m_SizeDelta: {x: 0, y: 0} |   m_SizeDelta: {x: 0, y: 0} | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
| --- !u!114 &4150581692906928959 | --- !u!114 &7236946357327453438 | ||||||
| MonoBehaviour: | MonoBehaviour: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|   m_CorrespondingSourceObject: {fileID: 0} |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  | @ -1535,18 +1497,22 @@ MonoBehaviour: | ||||||
|   m_GameObject: {fileID: 6701890203127158494} |   m_GameObject: {fileID: 6701890203127158494} | ||||||
|   m_Enabled: 1 |   m_Enabled: 1 | ||||||
|   m_EditorHideFlags: 0 |   m_EditorHideFlags: 0 | ||||||
|   m_Script: {fileID: 11500000, guid: 47bc31a2c7d14478bd4ebe3c32e41185, type: 3} |   m_Script: {fileID: 11500000, guid: ab9ddab5084248d68b0cb2c53c8dc7cc, type: 3} | ||||||
|   m_Name:  |   m_Name:  | ||||||
|   m_EditorClassIdentifier:  |   m_EditorClassIdentifier:  | ||||||
|   lockPanel: {fileID: 0} |   cookingButton: {fileID: 3658417434522814400} | ||||||
|   lockPanelText: {fileID: 0} |   disabledObject: {fileID: 3658417434859902285} | ||||||
|   detailButton: {fileID: 0} |   cookedObject: {fileID: 2679656543278342664} | ||||||
|   flavorName: {fileID: 6701890202664346918} |   perfectCookedObject: {fileID: 3658417434568161586} | ||||||
|   flavorPrice: {fileID: 6701890202901161252} |   rarityView: {fileID: 5676996117682643677} | ||||||
|   cornAmountText: {fileID: 2506280626346203665} |   nameText: {fileID: 6701890202664346918} | ||||||
|   flavor1AmountText: {fileID: 6701890203883728052} |   stockText: {fileID: 6701890202901161252} | ||||||
|   flavor2AmountText: {fileID: 8120304310888387127} |   cornText: {fileID: 2506280626346203665} | ||||||
|   flavor2View: {fileID: 8120304310515719315} |   material1Text: {fileID: 6701890203883728052} | ||||||
|  |   material2Text: {fileID: 8120304310888387127} | ||||||
|  |   material1IconTarget: {fileID: 2157734177276742269} | ||||||
|  |   material2IconTarget: {fileID: 3477121770257347838} | ||||||
|  |   packageIconTarget: {fileID: 6701890202353341293} | ||||||
| --- !u!1 &6701890203527111184 | --- !u!1 &6701890203527111184 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -2079,3 +2045,155 @@ MonoBehaviour: | ||||||
|   m_FillOrigin: 0 |   m_FillOrigin: 0 | ||||||
|   m_UseSpriteMesh: 0 |   m_UseSpriteMesh: 0 | ||||||
|   m_PixelsPerUnitMultiplier: 1 |   m_PixelsPerUnitMultiplier: 1 | ||||||
|  | --- !u!1001 &5112378705130438364 | ||||||
|  | PrefabInstance: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   serializedVersion: 2 | ||||||
|  |   m_Modification: | ||||||
|  |     m_TransformParent: {fileID: 3658417434568161581} | ||||||
|  |     m_Modifications: | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_Pivot.x | ||||||
|  |       value: 0.5 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_Pivot.y | ||||||
|  |       value: 0.5 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_RootOrder | ||||||
|  |       value: 1 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_AnchorMax.x | ||||||
|  |       value: 0.5 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_AnchorMax.y | ||||||
|  |       value: 0.5 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_AnchorMin.x | ||||||
|  |       value: 0.5 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_AnchorMin.y | ||||||
|  |       value: 0.5 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_SizeDelta.x | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_SizeDelta.y | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalScale.x | ||||||
|  |       value: 0.57123893 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalScale.y | ||||||
|  |       value: 0.57123893 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalScale.z | ||||||
|  |       value: 0.57123893 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalPosition.x | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalPosition.y | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalPosition.z | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalRotation.w | ||||||
|  |       value: 1 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalRotation.x | ||||||
|  |       value: -0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalRotation.y | ||||||
|  |       value: -0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalRotation.z | ||||||
|  |       value: -0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_AnchoredPosition.x | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_AnchoredPosition.y | ||||||
|  |       value: -37.5 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalEulerAnglesHint.x | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalEulerAnglesHint.y | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_LocalEulerAnglesHint.z | ||||||
|  |       value: 0 | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     - target: {fileID: 592905858299255811, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |         type: 3} | ||||||
|  |       propertyPath: m_Name | ||||||
|  |       value: rare_Canvas | ||||||
|  |       objectReference: {fileID: 0} | ||||||
|  |     m_RemovedComponents: [] | ||||||
|  |   m_SourcePrefab: {fileID: 100100000, guid: 2c82036225f2d453cac3ff9fb07fae4d, type: 3} | ||||||
|  | --- !u!114 &5676996117682643677 stripped | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 592905858299255809, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |     type: 3} | ||||||
|  |   m_PrefabInstance: {fileID: 5112378705130438364} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 0} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: 01738374a494495b82539c6ff39c1a3a, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
|  | --- !u!224 &5676996117682643678 stripped | ||||||
|  | RectTransform: | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, | ||||||
|  |     type: 3} | ||||||
|  |   m_PrefabInstance: {fileID: 5112378705130438364} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |  | ||||||
|  | @ -9,6 +9,7 @@ GameObject: | ||||||
|   serializedVersion: 6 |   serializedVersion: 6 | ||||||
|   m_Component: |   m_Component: | ||||||
|   - component: {fileID: 1266659963694843888} |   - component: {fileID: 1266659963694843888} | ||||||
|  |   - component: {fileID: 2576005101485369442} | ||||||
|   m_Layer: 5 |   m_Layer: 5 | ||||||
|   m_Name: Orde |   m_Name: Orde | ||||||
|   m_TagString: Untagged |   m_TagString: Untagged | ||||||
|  | @ -37,6 +38,23 @@ RectTransform: | ||||||
|   m_AnchoredPosition: {x: 0, y: 0} |   m_AnchoredPosition: {x: 0, y: 0} | ||||||
|   m_SizeDelta: {x: 550, y: 74} |   m_SizeDelta: {x: 550, y: 74} | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
|  | --- !u!114 &2576005101485369442 | ||||||
|  | MonoBehaviour: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 1266659963694843889} | ||||||
|  |   m_Enabled: 1 | ||||||
|  |   m_EditorHideFlags: 0 | ||||||
|  |   m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} | ||||||
|  |   m_Name:  | ||||||
|  |   m_EditorClassIdentifier:  | ||||||
|  |   materialNameText: {fileID: 1266659963782799786} | ||||||
|  |   materialAmountText: {fileID: 5530322429652472391} | ||||||
|  |   materialIconTarget: {fileID: 4067663658127716431} | ||||||
|  |   itemObject: {fileID: 2012605225197334536} | ||||||
|  |   disabledObject: {fileID: 6078742360956254766} | ||||||
| --- !u!1 &1266659963782799784 | --- !u!1 &1266659963782799784 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -127,7 +145,7 @@ GameObject: | ||||||
|   - component: {fileID: 1266659964433289955} |   - component: {fileID: 1266659964433289955} | ||||||
|   - component: {fileID: 1266659964433289952} |   - component: {fileID: 1266659964433289952} | ||||||
|   m_Layer: 5 |   m_Layer: 5 | ||||||
|   m_Name: Popcorn |   m_Name: package | ||||||
|   m_TagString: Untagged |   m_TagString: Untagged | ||||||
|   m_Icon: {fileID: 0} |   m_Icon: {fileID: 0} | ||||||
|   m_NavMeshLayer: 0 |   m_NavMeshLayer: 0 | ||||||
|  | @ -140,16 +158,16 @@ RectTransform: | ||||||
|   m_PrefabInstance: {fileID: 0} |   m_PrefabInstance: {fileID: 0} | ||||||
|   m_PrefabAsset: {fileID: 0} |   m_PrefabAsset: {fileID: 0} | ||||||
|   m_GameObject: {fileID: 1266659964433289958} |   m_GameObject: {fileID: 1266659964433289958} | ||||||
|   m_LocalRotation: {x: -0, y: -0, z: -0.11129463, w: 0.9937875} |   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|   m_LocalScale: {x: 0.6000001, y: 0.6000001, z: 0.5999999} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: [] |   m_Children: [] | ||||||
|   m_Father: {fileID: 9017528630810034763} |   m_Father: {fileID: 4067663658127716431} | ||||||
|   m_RootOrder: 1 |   m_RootOrder: 0 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|   m_AnchoredPosition: {x: -222.99997, y: 0} |   m_AnchoredPosition: {x: 0, y: 0} | ||||||
|   m_SizeDelta: {x: 92, y: 136} |   m_SizeDelta: {x: 92, y: 136} | ||||||
|   m_Pivot: {x: 0.5, y: 0.5} |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
| --- !u!222 &1266659964433289955 | --- !u!222 &1266659964433289955 | ||||||
|  | @ -217,7 +235,7 @@ RectTransform: | ||||||
|   m_LocalScale: {x: 1, y: 1, z: 1} |   m_LocalScale: {x: 1, y: 1, z: 1} | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 1805757311142186072} |   - {fileID: 1805757311142186072} | ||||||
|   - {fileID: 1266659964433289953} |   - {fileID: 4067663658127716431} | ||||||
|   - {fileID: 1266659963782799787} |   - {fileID: 1266659963782799787} | ||||||
|   - {fileID: 8467582708424851607} |   - {fileID: 8467582708424851607} | ||||||
|   m_Father: {fileID: 1266659963694843888} |   m_Father: {fileID: 1266659963694843888} | ||||||
|  | @ -491,6 +509,42 @@ MonoBehaviour: | ||||||
|     m_VerticalOverflow: 0 |     m_VerticalOverflow: 0 | ||||||
|     m_LineSpacing: 1 |     m_LineSpacing: 1 | ||||||
|   m_Text: 150 |   m_Text: 150 | ||||||
|  | --- !u!1 &8226191546660308840 | ||||||
|  | GameObject: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   serializedVersion: 6 | ||||||
|  |   m_Component: | ||||||
|  |   - component: {fileID: 4067663658127716431} | ||||||
|  |   m_Layer: 5 | ||||||
|  |   m_Name: Popcorn | ||||||
|  |   m_TagString: Untagged | ||||||
|  |   m_Icon: {fileID: 0} | ||||||
|  |   m_NavMeshLayer: 0 | ||||||
|  |   m_StaticEditorFlags: 0 | ||||||
|  |   m_IsActive: 1 | ||||||
|  | --- !u!224 &4067663658127716431 | ||||||
|  | RectTransform: | ||||||
|  |   m_ObjectHideFlags: 0 | ||||||
|  |   m_CorrespondingSourceObject: {fileID: 0} | ||||||
|  |   m_PrefabInstance: {fileID: 0} | ||||||
|  |   m_PrefabAsset: {fileID: 0} | ||||||
|  |   m_GameObject: {fileID: 8226191546660308840} | ||||||
|  |   m_LocalRotation: {x: -0, y: -0, z: -0.11129463, w: 0.9937875} | ||||||
|  |   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||||
|  |   m_LocalScale: {x: 0.6000001, y: 0.6000001, z: 0.5999999} | ||||||
|  |   m_Children: | ||||||
|  |   - {fileID: 1266659964433289953} | ||||||
|  |   m_Father: {fileID: 9017528630810034763} | ||||||
|  |   m_RootOrder: 1 | ||||||
|  |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} | ||||||
|  |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|  |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  |   m_AnchoredPosition: {x: -222.99997, y: 0} | ||||||
|  |   m_SizeDelta: {x: 92, y: 136} | ||||||
|  |   m_Pivot: {x: 0.5, y: 0.5} | ||||||
| --- !u!1 &8690967114179661769 | --- !u!1 &8690967114179661769 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -272,7 +272,7 @@ MonoBehaviour: | ||||||
|     m_SelectOnDown: {fileID: 0} |     m_SelectOnDown: {fileID: 0} | ||||||
|     m_SelectOnLeft: {fileID: 0} |     m_SelectOnLeft: {fileID: 0} | ||||||
|     m_SelectOnRight: {fileID: 0} |     m_SelectOnRight: {fileID: 0} | ||||||
|   m_Transition: 1 |   m_Transition: 0 | ||||||
|   m_Colors: |   m_Colors: | ||||||
|     m_NormalColor: {r: 1, g: 1, b: 1, a: 1} |     m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | ||||||
|     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} |     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||||||
|  | @ -367,6 +367,7 @@ MonoBehaviour: | ||||||
|   phoneAnimator: {fileID: 9152305840986396987} |   phoneAnimator: {fileID: 9152305840986396987} | ||||||
|   indicatorAnimator: {fileID: 8309988580877545720} |   indicatorAnimator: {fileID: 8309988580877545720} | ||||||
|   titleObject: {fileID: 6630966004704031400} |   titleObject: {fileID: 6630966004704031400} | ||||||
|  |   balloonObject: {fileID: 1129648163941645728} | ||||||
| --- !u!1 &6630966004704031400 | --- !u!1 &6630966004704031400 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  |  | ||||||
|  | @ -0,0 +1,107 @@ | ||||||
|  | using System; | ||||||
|  | using System.Linq; | ||||||
|  | using UniRx; | ||||||
|  | using UnityEngine; | ||||||
|  | using UnityEngine.UI; | ||||||
|  | 
 | ||||||
|  | public class BulkOrderProgressData | ||||||
|  | { | ||||||
|  |     public int orderId; | ||||||
|  |     public ProductRarity rarity; | ||||||
|  | } | ||||||
|  | public class BulkOrder : MonoBehaviour | ||||||
|  | { | ||||||
|  |     public static readonly string DataTag = "BulkOrderData"; | ||||||
|  |     public static readonly string CancelCallbackTag = "BulkOrderCancelCallback"; | ||||||
|  |     private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); | ||||||
|  |     private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); | ||||||
|  |     [SerializeField] private Animator backgroundAnimator; | ||||||
|  |     [SerializeField] private Button closeButton; | ||||||
|  | 
 | ||||||
|  |     [SerializeField] private Button cancelButton; | ||||||
|  |     [SerializeField] private Button deliveredButton; | ||||||
|  |     [SerializeField] private GameObject achievedObject; | ||||||
|  |     [SerializeField] private Text messageText; | ||||||
|  |     [SerializeField] private Text coinText; | ||||||
|  |     [SerializeField] private Text heartText; | ||||||
|  |     [SerializeField] private BulkOrderItemView itemView1; | ||||||
|  |     [SerializeField] private BulkOrderItemView itemView2; | ||||||
|  |     [SerializeField] private BulkOrderItemView itemView3; | ||||||
|  | 
 | ||||||
|  |     private void Start() | ||||||
|  |     { | ||||||
|  |         closeButton.OnClickAsObservable().Subscribe(_ => | ||||||
|  |         { | ||||||
|  |             transform.parent.SetLocalScale(0); | ||||||
|  |             backgroundAnimator.SetTrigger(CloseTrigger); | ||||||
|  |             this.CallWaitForSeconds(.25f, () => | ||||||
|  |             { | ||||||
|  |                 TransitionManager.Instance.UnloadScene(GameScenes.BulkOrder); | ||||||
|  |             }); | ||||||
|  |         }).AddTo(this); | ||||||
|  | 
 | ||||||
|  |         var gameData = GameDataManager.GameData; | ||||||
|  |         // キャンセルすると試食と同じ扱い | ||||||
|  |         // 試食時のお客さんの増加ってどれくらいなんだろ | ||||||
|  |         var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet); | ||||||
|  |         var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet); | ||||||
|  |         var bulkOrderData = bulkOrderList[gameData.OrderIdInProgress]; | ||||||
|  |         messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText; | ||||||
|  |         coinText.text = bulkOrderData.rewardCoin.ToString(); | ||||||
|  |         heartText.text = bulkOrderData.rewardHeart.ToString(); | ||||||
|  |         // cache | ||||||
|  |         LocalCacheManager.Save(DataTag, bulkOrderData); | ||||||
|  |         cancelButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => | ||||||
|  |         { | ||||||
|  |             LocalCacheManager.Save(CancelCallbackTag, new Action(() => | ||||||
|  |             { | ||||||
|  |                 // 試食フラグ | ||||||
|  |                 gameData.CancelOrderId = gameData.OrderIdInProgress; | ||||||
|  |                 // カウントリセット | ||||||
|  |                 gameData.OrderConditionCount = 0; | ||||||
|  |                  | ||||||
|  |                 TransitionManager.Instance.UnloadScene(GameScenes.BulkOrder); | ||||||
|  |             })); | ||||||
|  |             TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderCancel); | ||||||
|  |         }).AddTo(this); | ||||||
|  | 
 | ||||||
|  |         deliveredButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => | ||||||
|  |         { | ||||||
|  |             // カウントリセット | ||||||
|  |             gameData.OrderConditionCount = 0; | ||||||
|  |             TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderAchievement); | ||||||
|  |         }).AddTo(this); | ||||||
|  | 
 | ||||||
|  |         var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet); | ||||||
|  |         if (productList.FirstOrDefault(data => data.id == bulkOrderData.productId1) is ProductData data1) | ||||||
|  |         { | ||||||
|  |             itemView1.SetData(data1, bulkOrderData.count1); | ||||||
|  |             itemView1.SetButtonActive(itemView1.CheckAmount(data1)); | ||||||
|  |             itemView1.gameObject.SetActive(true); | ||||||
|  |         } | ||||||
|  |         else | ||||||
|  |         { | ||||||
|  |             itemView1.gameObject.SetActive(false); | ||||||
|  |         } | ||||||
|  |         if (productList.FirstOrDefault(data => data.id == bulkOrderData.productId2) is ProductData data2) | ||||||
|  |         { | ||||||
|  |             itemView2.SetData(data2, bulkOrderData.count2); | ||||||
|  |             itemView2.SetButtonActive(itemView2.CheckAmount(data2)); | ||||||
|  |             itemView2.gameObject.SetActive(true); | ||||||
|  |         } | ||||||
|  |         else | ||||||
|  |         { | ||||||
|  |             itemView2.gameObject.SetActive(false); | ||||||
|  |         } | ||||||
|  |         if (productList.FirstOrDefault(data => data.id == bulkOrderData.productId3) is ProductData data3) | ||||||
|  |         { | ||||||
|  |             itemView3.SetData(data3, bulkOrderData.count3); | ||||||
|  |             itemView3.SetButtonActive(itemView3.CheckAmount(data3)); | ||||||
|  |             itemView3.gameObject.SetActive(true); | ||||||
|  |         } | ||||||
|  |         else | ||||||
|  |         { | ||||||
|  |             itemView3.gameObject.SetActive(false); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @ -0,0 +1,3 @@ | ||||||
|  | fileFormatVersion: 2 | ||||||
|  | guid: 5dcfec9a112d409796b81c96710930a6 | ||||||
|  | timeCreated: 1633498142 | ||||||
|  | @ -0,0 +1,6 @@ | ||||||
|  | using UnityEngine; | ||||||
|  | 
 | ||||||
|  | public class BulkOrderAchievedView : MonoBehaviour | ||||||
|  | { | ||||||
|  |      | ||||||
|  | } | ||||||
|  | @ -0,0 +1,3 @@ | ||||||
|  | fileFormatVersion: 2 | ||||||
|  | guid: 97711eafafff465ebe1223e7ed0ab2e7 | ||||||
|  | timeCreated: 1633600571 | ||||||
|  | @ -0,0 +1,51 @@ | ||||||
|  | using System; | ||||||
|  | using UniRx; | ||||||
|  | using UnityEngine; | ||||||
|  | using UnityEngine.UI; | ||||||
|  | 
 | ||||||
|  | public class BulkOrderCancelView : MonoBehaviour | ||||||
|  | { | ||||||
|  |     private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); | ||||||
|  |     private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); | ||||||
|  |     [SerializeField] private Animator backgroundAnimator; | ||||||
|  |     [SerializeField] private Button closeButton; | ||||||
|  |      | ||||||
|  |     [SerializeField] private Button cancelButton; | ||||||
|  |     [SerializeField] private Text coinText; | ||||||
|  |     [SerializeField] private Text heartText; | ||||||
|  | 
 | ||||||
|  |     private void Start() | ||||||
|  |     { | ||||||
|  |         if (LocalCacheManager.Load<BulkOrderData>(BulkOrder.DataTag, null) is BulkOrderData orderData) | ||||||
|  |         { | ||||||
|  |             coinText.text = orderData.rewardCoin.ToString(); | ||||||
|  |             heartText.text = orderData.rewardHeart.ToString(); | ||||||
|  |         } | ||||||
|  |         closeButton.OnClickAsObservable().Subscribe(_ => | ||||||
|  |         { | ||||||
|  |             transform.parent.SetLocalScale(0); | ||||||
|  |             backgroundAnimator.SetTrigger(CloseTrigger); | ||||||
|  |             this.CallWaitForSeconds(.25f, () => | ||||||
|  |             { | ||||||
|  |                 TransitionManager.Instance.UnloadScene(GameScenes.BulkOrderCancel); | ||||||
|  |             }); | ||||||
|  |         }).AddTo(this); | ||||||
|  |         cancelButton.OnClickAsObservable().Subscribe(_ => | ||||||
|  |         { | ||||||
|  |             if (LocalCacheManager.Load<Action>(BulkOrder.CancelCallbackTag, null) is Action callback) | ||||||
|  |             { | ||||||
|  |                 callback.Invoke(); | ||||||
|  |             } | ||||||
|  |             if (LocalCacheManager.Load<Action>(KitchenManager.CancelCallbackTag, null) is Action callback2) | ||||||
|  |             { | ||||||
|  |                 callback2.Invoke(); | ||||||
|  |             } | ||||||
|  |             transform.parent.SetLocalScale(0); | ||||||
|  |             backgroundAnimator.SetTrigger(CloseTrigger); | ||||||
|  |             this.CallWaitForSeconds(.25f, () => | ||||||
|  |             { | ||||||
|  |                 TransitionManager.Instance.UnloadScene(GameScenes.BulkOrderCancel); | ||||||
|  |             }); | ||||||
|  |         }).AddTo(this); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @ -0,0 +1,3 @@ | ||||||
|  | fileFormatVersion: 2 | ||||||
|  | guid: 3bace6e100bf4e3a8059828acdc02e1b | ||||||
|  | timeCreated: 1633531953 | ||||||
|  | @ -9,20 +9,22 @@ public class BulkOrderIndicatorView : MonoBehaviour | ||||||
|     [SerializeField] private Animator phoneAnimator; |     [SerializeField] private Animator phoneAnimator; | ||||||
|     [SerializeField] private Animator indicatorAnimator; |     [SerializeField] private Animator indicatorAnimator; | ||||||
|     [SerializeField] private GameObject titleObject; |     [SerializeField] private GameObject titleObject; | ||||||
|  |     [SerializeField] private GameObject balloonObject; | ||||||
| 
 | 
 | ||||||
|     private static readonly int Ring = Animator.StringToHash("Ring"); |     private static readonly int Ring = Animator.StringToHash("Ring"); | ||||||
|     private static readonly int Speech = Animator.StringToHash("Speech"); |     private static readonly int Speech = Animator.StringToHash("Speech"); | ||||||
| 
 | 
 | ||||||
|     // [SerializeField] private Button button; |  | ||||||
|     public IObservable<Unit> TappedPhone => button.OnClickAsObservable().TakeUntilDestroy(this); |     public IObservable<Unit> TappedPhone => button.OnClickAsObservable().TakeUntilDestroy(this); | ||||||
| 
 | 
 | ||||||
|     public void SetIndicate(bool received, bool achieved) |     public void SetIndicate(bool receive, bool achieved) | ||||||
|     { |     { | ||||||
|         if (!received) |         if (receive) | ||||||
|         { |         { | ||||||
|             phoneAnimator.SetTrigger(Ring); |             phoneAnimator.SetTrigger(Ring); | ||||||
|             indicatorAnimator.SetTrigger(Speech); |             indicatorAnimator.SetTrigger(Speech); | ||||||
|         } |         } | ||||||
|         titleObject.SetActive(received && !achieved); |         button.interactable = receive || !achieved; | ||||||
|  |         titleObject.SetActive(!receive && !achieved); | ||||||
|  |         balloonObject.SetActive(receive); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -0,0 +1,98 @@ | ||||||
|  | using System; | ||||||
|  | using System.Linq; | ||||||
|  | using UniRx; | ||||||
|  | using UnityEngine; | ||||||
|  | using UnityEngine.UI; | ||||||
|  | 
 | ||||||
|  | public class BulkOrderItemView : MonoBehaviour | ||||||
|  | { | ||||||
|  |     private static readonly string amountFormat = "x{0}"; | ||||||
|  |     [SerializeField] private Button cookingButton; | ||||||
|  |     [SerializeField] private GameObject disabledObject; | ||||||
|  |     [SerializeField] private GameObject cookedObject; | ||||||
|  |     [SerializeField] private GameObject perfectCookedObject; | ||||||
|  |     [SerializeField] private RarityView rarityView; | ||||||
|  |     [SerializeField] private Text nameText; | ||||||
|  |     [SerializeField] private Text stockText; | ||||||
|  |     [SerializeField] private Text cornText; | ||||||
|  |     [SerializeField] private Text material1Text; | ||||||
|  |     [SerializeField] private Text material2Text; | ||||||
|  |     [SerializeField] private Transform material1IconTarget; | ||||||
|  |     [SerializeField] private Transform material2IconTarget; | ||||||
|  |     [SerializeField] private Transform packageIconTarget; | ||||||
|  | 
 | ||||||
|  |     public IObservable<Unit> CookingButton => cookingButton.OnClickAsObservable().TakeUntilDestroy(this); | ||||||
|  | 
 | ||||||
|  |     public void SetData(ProductData data, int wantStock) | ||||||
|  |     { | ||||||
|  |         var materialCount = wantStock / data.volume; | ||||||
|  |         stockText.text = wantStock.ToString(); | ||||||
|  |         nameText.text = data.name; | ||||||
|  |         cornText.text = string.Format(amountFormat, data.MaterialList[0].amount * materialCount); | ||||||
|  |         packageIconTarget.DestroyAllChildrens(); | ||||||
|  |         Instantiate(data.GetIconPrefab(), packageIconTarget); | ||||||
|  |          | ||||||
|  |         material1Text.text = string.Format(amountFormat, data.MaterialList[1].amount * materialCount); | ||||||
|  |         material2Text.text = string.Format(amountFormat, data.MaterialList[2].amount * materialCount); | ||||||
|  |         var shopData = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet); | ||||||
|  |         if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[1].id)?.GetIconPrefab() is Transform prefab1) | ||||||
|  |         { | ||||||
|  |             material1IconTarget.DestroyAllChildrens(); | ||||||
|  |             Instantiate(prefab1, material1IconTarget); | ||||||
|  |         } | ||||||
|  |         if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[2].id)?.GetIconPrefab() is Transform prefab2) | ||||||
|  |         { | ||||||
|  |             material2IconTarget.DestroyAllChildrens(); | ||||||
|  |             Instantiate(prefab2, material2IconTarget); | ||||||
|  |         } | ||||||
|  |         else | ||||||
|  |         { | ||||||
|  |             material2Text.transform.parent.gameObject.SetActive(false); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |      | ||||||
|  |     public bool CheckAmount(ProductData productData) | ||||||
|  |     { | ||||||
|  |         var flag = true; | ||||||
|  |         var gameData = GameDataManager.GameData; | ||||||
|  |         if (gameData.CornSeed < productData.MaterialList[0].amount) | ||||||
|  |         { | ||||||
|  |             flag = false; | ||||||
|  |             cornText.color = Color.red; | ||||||
|  |         } | ||||||
|  |         if ((gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[1].id)?.Amount ?? 0) < productData.MaterialList[1].amount) | ||||||
|  |         { | ||||||
|  |             flag = false; | ||||||
|  |             material1Text.color = Color.red; | ||||||
|  |         } | ||||||
|  |         if (productData.GetMaterialCount() == 3 && (gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[2].id)?.Amount ?? 0) < productData.MaterialList[2].amount) | ||||||
|  |         { | ||||||
|  |             flag = false; | ||||||
|  |             material2Text.color = Color.red; | ||||||
|  |         } | ||||||
|  |         return flag; | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|  |     public void SetButtonActive(bool active) | ||||||
|  |     { | ||||||
|  |         cookedObject.SetActive(false); | ||||||
|  |         perfectCookedObject.SetActive(false); | ||||||
|  |         cookingButton.gameObject.SetActive(active); | ||||||
|  |         disabledObject.SetActive(!active); | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|  |     public void SetCooked(ProductRarity rarity) | ||||||
|  |     { | ||||||
|  |         cookingButton.gameObject.SetActive(false); | ||||||
|  |         disabledObject.SetActive(false); | ||||||
|  |         if (rarity == ProductRarity.Normal) | ||||||
|  |         { | ||||||
|  |             cookedObject.SetActive(true); | ||||||
|  |         } | ||||||
|  |         else | ||||||
|  |         { | ||||||
|  |             perfectCookedObject.SetActive(true); | ||||||
|  |             rarityView.SetRarity(rarity); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @ -0,0 +1,3 @@ | ||||||
|  | fileFormatVersion: 2 | ||||||
|  | guid: ab9ddab5084248d68b0cb2c53c8dc7cc | ||||||
|  | timeCreated: 1633529450 | ||||||
|  | @ -0,0 +1,25 @@ | ||||||
|  | using UnityEngine; | ||||||
|  | using UnityEngine.UI; | ||||||
|  | 
 | ||||||
|  | public class BulkOrderNotifyItemView : MonoBehaviour | ||||||
|  | { | ||||||
|  |     [SerializeField] private Text materialNameText; | ||||||
|  |     [SerializeField] private Text materialAmountText; | ||||||
|  |     [SerializeField] private Transform materialIconTarget; | ||||||
|  |     [SerializeField] private GameObject itemObject; | ||||||
|  |     [SerializeField] private GameObject disabledObject; | ||||||
|  | 
 | ||||||
|  |     public void SetData(string name, int amount, Transform prefab) | ||||||
|  |     { | ||||||
|  |         materialAmountText.text = amount.ToString(); | ||||||
|  |         materialNameText.text = name; | ||||||
|  |         materialIconTarget.DestroyAllChildrens(); | ||||||
|  |         Instantiate(prefab, materialIconTarget); | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|  |     public void SetActive(bool active) | ||||||
|  |     { | ||||||
|  |         itemObject.SetActive(active); | ||||||
|  |         disabledObject.SetActive(!active); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @ -0,0 +1,3 @@ | ||||||
|  | fileFormatVersion: 2 | ||||||
|  | guid: 6f14cd02713649c5b189cbc9fb0b5bfd | ||||||
|  | timeCreated: 1633533755 | ||||||
|  | @ -0,0 +1,72 @@ | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using UniRx; | ||||||
|  | using UnityEngine; | ||||||
|  | using UnityEngine.UI; | ||||||
|  | 
 | ||||||
|  | public class BulkOrderNotifyView : MonoBehaviour | ||||||
|  | { | ||||||
|  |     private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); | ||||||
|  |     private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); | ||||||
|  |     [SerializeField] private Animator backgroundAnimator; | ||||||
|  |     [SerializeField] private Button closeButton; | ||||||
|  |      | ||||||
|  |     [SerializeField] private Text messageText; | ||||||
|  |     [SerializeField] private BulkOrderNotifyItemView itemView1; | ||||||
|  |     [SerializeField] private BulkOrderNotifyItemView itemView2; | ||||||
|  |     [SerializeField] private BulkOrderNotifyItemView itemView3; | ||||||
|  |     [SerializeField] private Text coinText; | ||||||
|  |     [SerializeField] private Text heartText; | ||||||
|  | 
 | ||||||
|  |     private void Start() | ||||||
|  |     { | ||||||
|  |         if (LocalCacheManager.Load<BulkOrderData>(BulkOrder.DataTag, null) is BulkOrderData orderData) | ||||||
|  |         { | ||||||
|  |             // Textは固定なのでID保持してここに反映かな? | ||||||
|  |             var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet); | ||||||
|  |             var orderTextIndex = 0; | ||||||
|  |             messageText.text = messageList.Where(data => data.shopLevel == orderData.shopLevel).ToList()[orderTextIndex].requestText; | ||||||
|  |             coinText.text = orderData.rewardCoin.ToString(); | ||||||
|  |             heartText.text = orderData.rewardHeart.ToString(); | ||||||
|  |              | ||||||
|  |             var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet); | ||||||
|  |             if (productList.FirstOrDefault(data => data.id == orderData.productId1) is ProductData data1) | ||||||
|  |             { | ||||||
|  |                 itemView1.SetData(data1.name, orderData.count1, data1.GetIconPrefab()); | ||||||
|  |                 itemView1.SetActive(true); | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 itemView1.SetActive(false); | ||||||
|  |             } | ||||||
|  |             if (productList.FirstOrDefault(data => data.id == orderData.productId2) is ProductData data2) | ||||||
|  |             { | ||||||
|  |                 itemView2.SetData(data2.name, orderData.count2, data2.GetIconPrefab()); | ||||||
|  |                 itemView2.SetActive(true); | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 itemView2.SetActive(false); | ||||||
|  |             } | ||||||
|  |             if (productList.FirstOrDefault(data => data.id == orderData.productId3) is ProductData data3) | ||||||
|  |             { | ||||||
|  |                 itemView3.SetData(data3.name, orderData.count3, data3.GetIconPrefab()); | ||||||
|  |                 itemView3.SetActive(true); | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 itemView3.SetActive(false); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         closeButton.OnClickAsObservable().Subscribe(_ => | ||||||
|  |         { | ||||||
|  |             transform.parent.SetLocalScale(0); | ||||||
|  |             backgroundAnimator.SetTrigger(CloseTrigger); | ||||||
|  |             this.CallWaitForSeconds(.25f, () => | ||||||
|  |             { | ||||||
|  |                 TransitionManager.Instance.UnloadScene(GameScenes.BulkOrderTelephone); | ||||||
|  |             }); | ||||||
|  |         }).AddTo(this); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @ -0,0 +1,3 @@ | ||||||
|  | fileFormatVersion: 2 | ||||||
|  | guid: aedda4da1f224450ad6f9b196e8e7e7d | ||||||
|  | timeCreated: 1633532782 | ||||||
|  | @ -3,15 +3,18 @@ using System.Collections; | ||||||
| using System.Collections.Generic; | using System.Collections.Generic; | ||||||
| using System.Linq; | using System.Linq; | ||||||
| using UniRx; | using UniRx; | ||||||
|  | using Unity.Mathematics; | ||||||
| using UnityEngine; | using UnityEngine; | ||||||
| using UnityEngine.UI; | using UnityEngine.UI; | ||||||
| 
 | 
 | ||||||
| public class KitchenManager : MonoBehaviour | public class KitchenManager : MonoBehaviour | ||||||
| { | { | ||||||
|  |     public static readonly string CancelCallbackTag = "BulkOrderCancelCallback"; | ||||||
|     [SerializeField] private Button cookingButton; |     [SerializeField] private Button cookingButton; | ||||||
|     [SerializeField] private Button adButton; |     [SerializeField] private Button adButton; | ||||||
|     [SerializeField] private KitchenView kitchenView; |     [SerializeField] private KitchenView kitchenView; | ||||||
|     [SerializeField] private BulkOrderIndicatorView orderIndicatorView; |     [SerializeField] private BulkOrderIndicatorView orderIndicatorView; | ||||||
|  | 
 | ||||||
|     // Start is called before the first frame update |     // Start is called before the first frame update | ||||||
|     void Start() |     void Start() | ||||||
|     { |     { | ||||||
|  | @ -43,51 +46,108 @@ public class KitchenManager : MonoBehaviour | ||||||
| #endif | #endif | ||||||
|          |          | ||||||
|         // 大量注文 |         // 大量注文 | ||||||
|         // 受け取っていない場合アニメーション |         var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet); | ||||||
|         orderIndicatorView.SetIndicate(false, false); |         var result = CheckBulkOrder(); | ||||||
|         orderIndicatorView.TappedPhone.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => |         var achieved = HeartMeter.Instance.ShopLevel.Value == gameData.AchievedOrderLevel; | ||||||
|  |         GameDataManager.SaveGameData(); | ||||||
|  |         LocalCacheManager.Save(CancelCallbackTag, new Action(() => | ||||||
|         { |         { | ||||||
|             TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder); |             orderIndicatorView.SetIndicate(false, true); | ||||||
|         }).AddTo(this); |         })); | ||||||
|          |         orderIndicatorView.SetIndicate(result.result, achieved || gameData.OrderIdInProgress == gameData.CancelOrderId); | ||||||
|         SetData(); |         if (result.result) | ||||||
|  |         { | ||||||
|  |             var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet); | ||||||
|  |             var nextMessageList = messageList.Where(data => data.shopLevel == result.nextOrderLevel).ToList(); | ||||||
|  |             orderIndicatorView.TappedPhone.ThrottleFirst(TimeSpan.FromSeconds(1f)).Take(1).Subscribe(_ => | ||||||
|  |             { | ||||||
|  |                 // タップで更新 | ||||||
|  |                 gameData.OrderIdInProgress = result.nextOrderId; | ||||||
|  |                 if (nextMessageList.Exists(data => data.id == gameData.OrderTextId)) | ||||||
|  |                 { | ||||||
|  |                     var messageCount = nextMessageList.Count; | ||||||
|  |                     var nextMessageIndex = nextMessageList.FindIndex(data => data.id == result.nextOrderId) + 1; | ||||||
|  |                     gameData.OrderTextId = messageList[nextMessageIndex >= messageCount ? 0 : nextMessageIndex].id; | ||||||
|  |                 } | ||||||
|  |                 else | ||||||
|  |                 { | ||||||
|  |                     gameData.OrderTextId = messageList.First().id; | ||||||
|  |                 } | ||||||
|  |                 GameDataManager.SaveGameData(); | ||||||
|  |                  | ||||||
|  |                 var orderData = bulkOrderList.First(data => data.id == result.nextOrderId); | ||||||
|  |                 LocalCacheManager.Save(BulkOrder.DataTag, orderData); | ||||||
|  |                 TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderTelephone); | ||||||
|  |                  | ||||||
|  |                 // 通知をタップ後タップ動作を切り替える | ||||||
|  |                 orderIndicatorView.SetIndicate(false, false); | ||||||
|  |                 orderIndicatorView.TappedPhone.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(__ => | ||||||
|  |                 { | ||||||
|  |                     TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder); | ||||||
|  |                 }).AddTo(this); | ||||||
|  |             }).AddTo(this); | ||||||
|  |         } | ||||||
|  |         else | ||||||
|  |         { | ||||||
|  |             if (gameData.OrderIdInProgress != gameData.CancelOrderId) | ||||||
|  |             { | ||||||
|  |                 orderIndicatorView.TappedPhone | ||||||
|  |                     .ThrottleFirst(TimeSpan.FromSeconds(1f)) | ||||||
|  |                     .Subscribe(_ => | ||||||
|  |                     { | ||||||
|  |                         TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder); | ||||||
|  |                     }).AddTo(this); | ||||||
|  |             } | ||||||
|  |         } | ||||||
| 
 | 
 | ||||||
| #if UNITY_EDITOR | #if UNITY_EDITOR | ||||||
|         Market.StockFlavorLog(); |         Market.StockFlavorLog(); | ||||||
| #endif | #endif | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     private void SetData() |     private (bool result, int nextOrderId, int nextOrderLevel) CheckBulkOrder() | ||||||
|     { |     { | ||||||
|         var gameData = GameDataManager.GameData; |         var gameData = GameDataManager.GameData; | ||||||
|         // 所持レシピ |         var nextOrderLevel = 0; | ||||||
|         if (gameData.MyRecipes == null || gameData.MyRecipes.Length == 0) |         var nextOrderId = gameData.OrderIdInProgress; | ||||||
|  |         var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet); | ||||||
|  |         if (!(bulkOrderList.FirstOrDefault(data => data.shopLevel >= gameData.AchievedOrderLevel + 1) is BulkOrderData bulkOrderData)) | ||||||
|         { |         { | ||||||
|             gameData.MyRecipes = new[] |             return (false, nextOrderId, nextOrderLevel); | ||||||
|             { |  | ||||||
|                 1, |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         // 所持素材 |  | ||||||
|         if (gameData.Material == null || gameData.Material.Count == 0) |  | ||||||
|         { |  | ||||||
|             gameData.Material = Enumerable.Range(1, 12).Select(x => new MaterialData(x, 0)).ToList(); |  | ||||||
|         } |         } | ||||||
|          |          | ||||||
|         // 保存タンク |         nextOrderLevel = bulkOrderData.shopLevel; | ||||||
|         if (gameData.StorageTanks == null || gameData.StorageTanks.Count == 0) |          | ||||||
|  |         if (HeartMeter.Instance.ShopLevel.Value < nextOrderLevel) | ||||||
|         { |         { | ||||||
|             gameData.StorageTanks = new List<StorageTank> |             return (false, nextOrderId, nextOrderLevel); | ||||||
|             { |  | ||||||
|                 new StorageTank |  | ||||||
|                 { |  | ||||||
|                     Id = 1, |  | ||||||
|                     Capacity = 50, |  | ||||||
|                     FlavorId = -1, |  | ||||||
|                 } |  | ||||||
|             }; |  | ||||||
|         } |         } | ||||||
|         GameDataManager.SaveGameData(); | 
 | ||||||
|  |         var nextOrderList = bulkOrderList.Where(data => data.shopLevel == nextOrderLevel).ToList(); | ||||||
|  |         if (!nextOrderList.Exists(data => data.id == gameData.OrderIdInProgress)) | ||||||
|  |         { | ||||||
|  |             // まだ次のオーダーが設定されてない場合shopLevelの一番若いIDを設定 | ||||||
|  |             nextOrderId = nextOrderList.First().id; | ||||||
|  |         } | ||||||
|  |         else if (gameData.OrderIdInProgress == gameData.CancelOrderId && gameData.CancelOrderId > 0) | ||||||
|  |         { | ||||||
|  |             // キャンセルされた場合次のIDを設定 | ||||||
|  |             var orderCount = nextOrderList.Count; | ||||||
|  |             var nextIndex = nextOrderList.FindIndex(data => data.id == gameData.OrderIdInProgress) + 1; | ||||||
|  |             nextOrderId = nextOrderList[nextIndex >= orderCount ? 0 : nextIndex].id; | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|  |         if (gameData.OrderIdInProgress == nextOrderId) | ||||||
|  |         { | ||||||
|  |             return (false, nextOrderId, nextOrderLevel); | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|  |         Debug.Log($"{gameData.OrderIdInProgress} {gameData.CancelOrderId} {nextOrderId} {gameData.OrderConditionCount}"); | ||||||
|  |         var orderData = nextOrderList.First(data => data.id == nextOrderId); | ||||||
|  |         var isFirst = !nextOrderList.Exists(data => data.id == gameData.CancelOrderId); | ||||||
|  |         var condition = isFirst ? orderData.firstOrderCondition : orderData.retryCondition; | ||||||
|  | 
 | ||||||
|  |         // 条件チェック | ||||||
|  |         return (condition <= gameData.OrderConditionCount, nextOrderId, nextOrderLevel); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -98,6 +98,24 @@ public sealed class GameData { | ||||||
|     [DataMember(Name = "Data25")] |     [DataMember(Name = "Data25")] | ||||||
|     private int[] achievedMission; |     private int[] achievedMission; | ||||||
|     public List<int> AchievedMission; |     public List<int> AchievedMission; | ||||||
|  |     // [DataMember(Name = "Data26")] | ||||||
|  |      | ||||||
|  |     // [DataMember(Name = "Data27")] | ||||||
|  |      | ||||||
|  |     [DataMember(Name = "Data28")] | ||||||
|  |     public int OrderIdInProgress; | ||||||
|  | 
 | ||||||
|  |     [DataMember(Name = "Data29")] | ||||||
|  |     public int OrderTextId; | ||||||
|  |     [DataMember(Name = "Data30")]  | ||||||
|  |     public int OrderConditionCount; | ||||||
|  |     [DataMember(Name = "Data31")]  | ||||||
|  |     public int CancelOrderId; | ||||||
|  |     [DataMember(Name = "Data32")] | ||||||
|  |     public int AchievedOrderLevel; | ||||||
|  |     // 進捗 | ||||||
|  |     [DataMember(Name = "Data33")] | ||||||
|  |     public List<BulkOrderProgressData> OrderProgressList; | ||||||
|      |      | ||||||
|     // mission |     // mission | ||||||
|     [DataMember(Name = "Data1001")]  |     [DataMember(Name = "Data1001")]  | ||||||
|  | @ -143,6 +161,7 @@ public sealed class GameData { | ||||||
| 
 | 
 | ||||||
|     public void AddSalesCount(int id, int stock, ProductRarity rarity) |     public void AddSalesCount(int id, int stock, ProductRarity rarity) | ||||||
|     { |     { | ||||||
|  |         OrderConditionCount += stock; | ||||||
|         if (TotalSalesList.FirstOrDefault(x => x.Rarity == rarity) is ProductStockData stockData) |         if (TotalSalesList.FirstOrDefault(x => x.Rarity == rarity) is ProductStockData stockData) | ||||||
|         { |         { | ||||||
|             stockData.Stock += stock; |             stockData.Stock += stock; | ||||||
|  | @ -205,6 +224,7 @@ public sealed class GameData { | ||||||
|         Pans = Pans ?? new int[0]; |         Pans = Pans ?? new int[0]; | ||||||
|         TotalSalesList = TotalSalesList ?? new List<ProductStockData>(); |         TotalSalesList = TotalSalesList ?? new List<ProductStockData>(); | ||||||
|         AchievedMission = achievedMission?.ToList() ?? new List<int>(); |         AchievedMission = achievedMission?.ToList() ?? new List<int>(); | ||||||
|  |         OrderProgressList = OrderProgressList ?? new List<BulkOrderProgressData>(); | ||||||
|     } |     } | ||||||
|     private Dictionary<int, int> ArrayToDictionary(KeyValueOfintint[] array){ |     private Dictionary<int, int> ArrayToDictionary(KeyValueOfintint[] array){ | ||||||
|         var dictionary = new Dictionary<int, int>(); |         var dictionary = new Dictionary<int, int>(); | ||||||
|  |  | ||||||
|  | @ -26,7 +26,7 @@ public enum GameScenes | ||||||
|     BulkOrder, |     BulkOrder, | ||||||
|     BulkOrderAchievement, |     BulkOrderAchievement, | ||||||
|     BulkOrderCancel, |     BulkOrderCancel, | ||||||
|     BulkOrderPhone, |     BulkOrderTelephone, | ||||||
|     SettingsDialog, |     SettingsDialog, | ||||||
|     DebugOption, |     DebugOption, | ||||||
|     UnableWatchVideoDialog, |     UnableWatchVideoDialog, | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue