# popcorn/Assets/MyGame/Scenes/CornField/CornField.unity 金币推送
# popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab 开发者版本 # popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity 开发者版本，需要增加隐私协议，国内 # popcorn/Assets/MyGame/Scenes/marketing/Customize.unity 开发者版本 # popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity 开发者版本 # popcorn/Assets/MyGame/Scenes/shopping/shopping.unity 开发者版本，其中有个晓辉改的修改显示bug不知道是什么 # popcorn/Assets/Resources/I2Languages.asset 开发者版本
This commit is contained in:
闫婷婷
parent
d543a98c6d
commit
3ec8ba598a
|
|
@ -121,32 +121,6 @@ NavMeshSettings:
|
|||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!114 &5838204
|
||||
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: 1401507177}
|
||||
--- !u!114 &16824281
|
||||
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: 1709156043}
|
||||
--- !u!1 &24537252
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -340,18 +314,6 @@ Transform:
|
|||
m_Father: {fileID: 2040636316}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &147614861 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 521511634720853184, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
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!1 &149181930
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -417,19 +379,6 @@ Transform:
|
|||
m_Father: {fileID: 1866526865}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &220609990
|
||||
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: 1980930080}
|
||||
--- !u!114 &260671573
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1036,11 +985,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1106859980}
|
||||
m_Father: {fileID: 387414334}
|
||||
<<<<<<< HEAD
|
||||
m_RootOrder: 11
|
||||
=======
|
||||
m_RootOrder: 10
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -1508,11 +1453,6 @@ PrefabInstance:
|
|||
propertyPath: onClickPlaySEFilename
|
||||
value: se_ButtonTap
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
@ -1531,11 +1471,7 @@ PrefabInstance:
|
|||
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
<<<<<<< HEAD
|
||||
value: 9
|
||||
=======
|
||||
value: 7
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
|
|
@ -1682,22 +1618,6 @@ MonoBehaviour:
|
|||
randomPlaySEFilenames: []
|
||||
randomPlayVoiceFilenames: []
|
||||
vibrationType: 0
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
--- !u!114 &452908902
|
||||
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: 1507187603938887412}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!1 &457045027
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1754,7 +1674,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 39
|
||||
m_Right: 78
|
||||
m_Right: 58
|
||||
m_Top: 4
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
|
|
@ -1798,7 +1718,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 3e6395a0cda798a47a6ddcc17370e27a, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: a64b1cc6e08eb5849a45654b25ba55bf, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -2437,31 +2357,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &650946944
|
||||
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: 651479253}
|
||||
--- !u!114 &651479253 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
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!1 &665770084
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3444,18 +3339,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &984088744 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
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!1 &989323255
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3849,18 +3732,6 @@ SortingGroup:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 27
|
||||
--- !u!114 &1144180163 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
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!1 &1164585267
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4131,19 +4002,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &1218410118
|
||||
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: 1516974627}
|
||||
--- !u!1001 &1226867710
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4504,18 +4362,6 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!114 &1401507177 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4466880344787820340, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
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!1 &1406886287
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4597,19 +4443,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &1447526946
|
||||
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: 1144180163}
|
||||
--- !u!1 &1452091997
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4765,19 +4598,6 @@ SortingGroup:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 31
|
||||
--- !u!114 &1497390460
|
||||
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: 984088744}
|
||||
--- !u!1 &1501215305
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4896,34 +4716,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
--- !u!114 &1516974627 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1339603270, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
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 &1537144681
|
||||
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: 147614861}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!1 &1537737291
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5455,18 +5247,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 1657f65ff2fe42ba87efbe278055bb7d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1709156043 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
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!1 &1734228464
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -15847,21 +15627,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1958951427}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
--- !u!114 &1980930080 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 387414332}
|
||||
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:
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!1 &1989990597
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -16379,7 +16144,7 @@ PrefabInstance:
|
|||
- target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 11
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28,
|
||||
type: 3}
|
||||
|
|
@ -16782,12 +16547,6 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1507187604136703913, guid: 21599f8e6d1104a07b0b14b49f8c1429,
|
||||
type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 33965d17844ba2f4a813cf42bf932db0,
|
||||
type: 3}
|
||||
- target: {fileID: 1507187604136703914, guid: 21599f8e6d1104a07b0b14b49f8c1429,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
|
|
@ -16957,7 +16716,7 @@ PrefabInstance:
|
|||
- target: {fileID: 1358427949382551085, guid: 307de4ac51c99479a95079dfa3713f04,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 12
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1358427949382551085, guid: 307de4ac51c99479a95079dfa3713f04,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -814,11 +814,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
<<<<<<< HEAD
|
||||
m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3}
|
||||
=======
|
||||
m_Sprite: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, type: 3}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
|
|
@ -1456,7 +1452,7 @@ MonoBehaviour:
|
|||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
|
|
|||
|
|
@ -298,7 +298,6 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1973484463}
|
||||
- {fileID: 1344990810}
|
||||
- {fileID: 715728122}
|
||||
m_Father: {fileID: 827436435}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -1230,12 +1229,6 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: -155, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!224 &715728122 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1682034355685615894}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &787553450
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2115,7 +2108,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 0}
|
||||
mTarget: {fileID: 1794914336}
|
||||
--- !u!1 &1283939611
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2510,13 +2503,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
<<<<<<< HEAD
|
||||
m_AnchoredPosition: {x: 131, y: -14}
|
||||
m_SizeDelta: {x: 250, y: 108}
|
||||
=======
|
||||
m_AnchoredPosition: {x: 0, y: -14}
|
||||
m_SizeDelta: {x: 300, y: 108}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1344990811
|
||||
MonoBehaviour:
|
||||
|
|
@ -3827,122 +3815,3 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 1894598663}
|
||||
--- !u!1001 &1682034355685615894
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 162960811}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 250
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 108
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -151
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682034354971069935, guid: 5f5256670b31e433bb92e5ad53a05298,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SettingPopViewButton
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5f5256670b31e433bb92e5ad53a05298, type: 3}
|
||||
|
|
|
|||
|
|
@ -698,15 +698,12 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3ad134b74850c4ce4b72ff15afadfabd, type: 3}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
--- !u!212 &293313977 stripped
|
||||
SpriteRenderer:
|
||||
m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6725113439449511083}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!1 &319475418
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2394,7 +2391,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 695678466}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -2413,7 +2410,8 @@ MonoBehaviour:
|
|||
AddSpacesToJoinedLanguages: 0
|
||||
AllowLocalizedParameters: 1
|
||||
AllowParameters: 1
|
||||
TranslatedObjects: []
|
||||
TranslatedObjects:
|
||||
- {fileID: 21300000, guid: 1b1f56cd08f942645b331422171b2269, type: 3}
|
||||
LocalizeEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
|
@ -2438,8 +2436,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
mTarget: {fileID: 227427383}
|
||||
--- !u!114 &776291670
|
||||
MonoBehaviour:
|
||||
|
|
@ -2453,7 +2449,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
mTarget: {fileID: 527833883}
|
||||
--- !u!1001 &811473976
|
||||
PrefabInstance:
|
||||
|
|
@ -3806,8 +3801,6 @@ MonoBehaviour:
|
|||
mGUI_ShowCallback: 0
|
||||
mLocalizeTarget: {fileID: 956104263}
|
||||
mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
--- !u!114 &1153839208
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3834,7 +3827,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 336991183}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!1 &1276255578
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4903,8 +4895,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1895333847}
|
||||
m_CullTransparentMesh: 0
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
--- !u!114 &1970854444
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4918,7 +4908,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 811473978}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!114 &2014261845
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -121,22 +121,6 @@ NavMeshSettings:
|
|||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &3564198
|
||||
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: 2701980939299648208}
|
||||
=======
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!1 &189791791
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -684,11 +668,7 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &388701216
|
||||
=======
|
||||
--- !u!114 &313910592
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -700,13 +680,8 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< HEAD
|
||||
mTarget: {fileID: 2701980939299648207}
|
||||
--- !u!114 &425791625
|
||||
=======
|
||||
mTarget: {fileID: 429638430}
|
||||
--- !u!114 &357254126
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -718,11 +693,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< HEAD
|
||||
mTarget: {fileID: 2701980939299648210}
|
||||
=======
|
||||
mTarget: {fileID: 1446845735}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!114 &429638430 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
|
|
@ -735,19 +706,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &464824602
|
||||
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: 1446845735}
|
||||
--- !u!114 &483734264 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4136975465723208433, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
|
|
@ -1192,19 +1150,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 748884348}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &795018802
|
||||
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: 429638430}
|
||||
--- !u!1 &935850165
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1279,36 +1224,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 935850165}
|
||||
m_CullTransparentMesh: 0
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &1139655502 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 219610911}
|
||||
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 &1208667148
|
||||
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: 2701980939299648212}
|
||||
--- !u!114 &1211869808
|
||||
=======
|
||||
--- !u!114 &1005979436
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -1321,36 +1237,18 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 1760930532}
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &1243354799
|
||||
=======
|
||||
--- !u!114 &1139655502 stripped
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 219610911}
|
||||
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: 2701980939299648215}
|
||||
--- !u!114 &1264087945
|
||||
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: 2701980939299648214}
|
||||
--- !u!1 &1322368921
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1425,22 +1323,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1322368921}
|
||||
m_CullTransparentMesh: 0
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &1395616245
|
||||
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: 2701980939299648206}
|
||||
=======
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!1 &1405932574
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1552,25 +1434,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &1654834765
|
||||
=======
|
||||
--- !u!114 &1539992273
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
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:
|
||||
<<<<<<< HEAD
|
||||
mTarget: {fileID: 1513025054}
|
||||
--- !u!114 &1687162695
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -1583,22 +1447,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 1139655502}
|
||||
--- !u!114 &1724250472
|
||||
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: 2701980939299648205}
|
||||
=======
|
||||
mTarget: {fileID: 1139655502}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
--- !u!114 &1760930532 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
|
|
@ -1611,19 +1459,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1924194386
|
||||
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: 2701980939299648216}
|
||||
--- !u!1 &1941251214
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1707,58 +1542,6 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1947232547
|
||||
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: 2701980939299648217}
|
||||
--- !u!114 &1952784028
|
||||
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: 2701980939299648209}
|
||||
--- !u!114 &2014300460
|
||||
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: 2701980939299648211}
|
||||
--- !u!114 &2142233585
|
||||
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: 2701980939299648213}
|
||||
--- !u!1001 &2701980939299648204
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2519,159 +2302,3 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3}
|
||||
--- !u!114 &2701980939299648205 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4560236508152718986, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648206 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648207 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4534594761780962508, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648208 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1883006365929839107, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648209 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5979409424124981824, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648210 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8826965070428866943, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648211 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 795262495608747387, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648212 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 795262494787334425, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648213 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 795262494940821442, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648214 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8826965070908774283, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648215 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8826965070472475005, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648216 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8826965070724525141, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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 &2701980939299648217 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8826965070414205926, guid: 0b1e1a744f3d5447d88970ba4f22d761,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2701980939299648204}
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ PrefabInstance:
|
|||
- target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3213111080442531914, guid: caaa748dbeed576499e8cae74d33f689,
|
||||
type: 3}
|
||||
|
|
@ -879,11 +879,6 @@ PrefabInstance:
|
|||
value:
|
||||
objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6,
|
||||
type: 3}
|
||||
- target: {fileID: 583619684917774370, guid: 667a93fb2929943078b944050cddd464,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 788033435718677201, guid: 667a93fb2929943078b944050cddd464,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
|
|
@ -1364,28 +1359,6 @@ PrefabInstance:
|
|||
value:
|
||||
objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187,
|
||||
type: 3}
|
||||
<<<<<<< HEAD
|
||||
- target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 50
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
=======
|
||||
- target: {fileID: 6758377365589220451, guid: 667a93fb2929943078b944050cddd464,
|
||||
type: 3}
|
||||
propertyPath: m_Sprite
|
||||
|
|
@ -1422,7 +1395,6 @@ PrefabInstance:
|
|||
value:
|
||||
objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2,
|
||||
type: 3}
|
||||
>>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37
|
||||
- target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464,
|
||||
type: 3}
|
||||
propertyPath: m_Sprite
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue