fix merge
This commit is contained in:
@@ -5955,6 +5955,10 @@ PrefabInstance:
|
||||
propertyPath: projectMenuButton
|
||||
value:
|
||||
objectReference: {fileID: 205755441}
|
||||
- target: {fileID: 4739726380097546759, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5366961481726599031, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.2462957
|
||||
@@ -6011,6 +6015,14 @@ PrefabInstance:
|
||||
propertyPath: LogicContent
|
||||
value:
|
||||
objectReference: {fileID: 384003842}
|
||||
- target: {fileID: 8164125700257988699, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
propertyPath: _apiConfigResourcePath
|
||||
value: APIEndPointsConfig
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8164125700257988699, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
propertyPath: _webConfigResourcePath
|
||||
value: WebConfig
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
Reference in New Issue
Block a user