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

Merge branch 'future/I2Localization' of bitbucket.org:usaya/popcorn into future/I2Localization

This commit is contained in:
atusi 2022-01-19 19:27:51 +09:00
parent 30bd0a9a1b ba2ba5ed2c
commit 9b72a96752
3 changed files with 130 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
popcorn/Assets/MyGame/Scenes/Main/Mission.unity
View File

@ -121,6 +121,19 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!114 &23593157
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 117251345}
--- !u!1001 &55686909
PrefabInstance:
m_ObjectHideFlags: 0
@ -584,32 +597,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3}
--- !u!114 &297372918
--- !u!114 &117251345 stripped
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 2660639679015166989, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
type: 3}
m_PrefabInstance: {fileID: 55686909}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1556136478}
--- !u!114 &316964578
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 439249517}
--- !u!114 &439249517 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5315427058870261576, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
@ -622,58 +621,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &771529810
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1614911828}
--- !u!114 &791726450 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
type: 3}
m_PrefabInstance: {fileID: 55686909}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &939695368
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1150667240}
--- !u!114 &1072811300
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1900675268}
--- !u!114 &1122205379
--- !u!114 &463005816
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -686,9 +634,60 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 791726450}
--- !u!114 &1150667240 stripped
--- !u!114 &471706765
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3089254109135973278, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 439249517}
--- !u!114 &607560463 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
type: 3}
m_PrefabInstance: {fileID: 55686909}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &669327496
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1614911828}
--- !u!114 &783666780
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1900675268}
--- !u!114 &791726450 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
type: 3}
m_PrefabInstance: {fileID: 55686909}
m_PrefabAsset: {fileID: 0}
@ -698,9 +697,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1178818524 stripped
--- !u!114 &1150667240 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2660639678752994312, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
m_CorrespondingSourceObject: {fileID: 3089254109135973278, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
type: 3}
m_PrefabInstance: {fileID: 55686909}
m_PrefabAsset: {fileID: 0}
@ -722,6 +721,32 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1562148314
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 607560463}
--- !u!114 &1562816802
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1556136478}
--- !u!114 &1614911828 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2088785184059642796, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
@ -734,7 +759,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1619395587
--- !u!114 &1653116222
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -746,7 +771,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1178818524}
mTarget: {fileID: 1150667240}
--- !u!114 &1767471428
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 2032510751}
--- !u!114 &1900675268 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 518689044540430268, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
@ -834,3 +872,15 @@ Camera:
type: 3}
m_PrefabInstance: {fileID: 1944170687}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2032510751 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2660639677480706697, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
type: 3}
m_PrefabInstance: {fileID: 55686909}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:

4
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
View File

@ -4754,8 +4754,8 @@ RectTransform:
m_Father: {fileID: 2719887426089723008}
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_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 98}
m_Pivot: {x: 0.5, y: 0.5}

2
popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
View File

@ -2526,7 +2526,7 @@ MonoBehaviour:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c7b0a686aead508458a3655665cf4abd, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1