Skip to content

Lobby service integration #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 145 commits into from
Feb 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
b8eb296
Adding DIScope - an implementation of dependency injection container …
pdeschain Feb 3, 2022
9520990
Reformat
pdeschain Feb 14, 2022
26ba134
Adding MessageChannel - a pub-sub message-passing pattern
pdeschain Feb 3, 2022
b489113
Formatting
pdeschain Feb 14, 2022
f32819c
UpdateRunner - single Update, usable by non-mbh classes and capable o…
pdeschain Feb 3, 2022
293929d
Formatting
pdeschain Feb 14, 2022
def44cf
Initial UI work to add a toggle for selecting public Lobbies
pdeschain Dec 15, 2021
912c688
compilation error fix (After rebase)
pdeschain Jan 4, 2022
45ddcb7
Created most of the necessary UI for lobby creation and joining
pdeschain Jan 5, 2022
625a6d6
moved logic from MainMenuUI to ClientMainMenuState
pdeschain Jan 8, 2022
2362239
#
pdeschain Jan 8, 2022
19b7fc7
#
pdeschain Jan 11, 2022
586105a
WIP work on porting Lobby Sample code to the Boss Room project
pdeschain Jan 11, 2022
5f9303a
WIP initialization of the lobby system
pdeschain Jan 14, 2022
43e5d3e
lobby ui manager wiring
pdeschain Jan 19, 2022
f1581f0
#
pdeschain Jan 19, 2022
14b1efe
lobby ui manager injects it's GOs automatically
pdeschain Jan 19, 2022
cd251e3
Added new popup prefab and moved logic to main menu state
pdeschain Jan 20, 2022
f837db5
wip main menu and login popup prefabs
pdeschain Jan 20, 2022
70d2775
More work on the LobbyPopup UI
pdeschain Jan 21, 2022
050d452
#
pdeschain Jan 24, 2022
f418cbe
#
pdeschain Jan 24, 2022
71d4df0
Fixed DI issues
pdeschain Jan 25, 2022
5a1d57e
rename fix
pdeschain Jan 25, 2022
4a6e58f
Updated MainMenu to use LobbyPopup, removed old UI elements
pdeschain Jan 25, 2022
07c429d
#
pdeschain Jan 25, 2022
ee0daf3
Private Toggle had raycast target disabled and was un-toggleable
pdeschain Jan 25, 2022
679ed97
working on lobby creation and the appropriate UI callbacks and reacitons
pdeschain Jan 26, 2022
d0ee722
#
pdeschain Jan 26, 2022
c102c97
Renamed UIFactory to GameObjectFactory, fixed the issue with lobby re…
pdeschain Jan 27, 2022
389c33f
#
pdeschain Jan 27, 2022
c03d4c3
#
pdeschain Jan 27, 2022
ab3d983
#
pdeschain Jan 27, 2022
daaf1bb
#
pdeschain Jan 31, 2022
9623e97
#
pdeschain Jan 31, 2022
b1b7eb5
Renamed error popup message into UnityServiceErrorMessage
pdeschain Jan 31, 2022
dba9297
#
pdeschain Feb 1, 2022
89b1226
Cleanups and refactorings
pdeschain Feb 1, 2022
f4a12f1
wip IP connection on lobby join (through creation and through the joi…
pdeschain Feb 1, 2022
8366d0d
passing lobby data immediately on creation (because we can, so why wait)
pdeschain Feb 1, 2022
44d05c5
Sometimes we want to block ui while fetching lobbies and other times …
pdeschain Feb 2, 2022
7e65d4f
#
pdeschain Feb 2, 2022
1124d64
passing correct ip from UI
pdeschain Feb 2, 2022
7d884b9
copied relay code from lobby sample
pdeschain Feb 2, 2022
d63f6c5
#
pdeschain Feb 2, 2022
bb6969f
backup copies of my versions of scenes for easier rebasing on dev
pdeschain Feb 2, 2022
971939b
re-did changes to startup scene
pdeschain Feb 2, 2022
ed85a9a
#
pdeschain Feb 2, 2022
682718b
moved some of the dependency registrations to the Bootstrap, where we…
pdeschain Feb 2, 2022
db2ab73
formatting
pdeschain Feb 2, 2022
522e1e0
#
pdeschain Feb 2, 2022
0269d1b
passed important dependency to the bootstrap class
pdeschain Feb 2, 2022
a6f51b1
#
pdeschain Feb 2, 2022
bb8e016
post-rebase cleanup
pdeschain Feb 3, 2022
db0b365
fixed an issue with code 404 returned on lobby refresh request
pdeschain Feb 7, 2022
31d0b1a
Moved OnApplicationQuit Lobby quit attempt logic into Bootstrap, wher…
pdeschain Feb 7, 2022
727e408
#
pdeschain Feb 7, 2022
24ea596
Bootstrap is now responsible for also containing applicaiton quit log…
pdeschain Feb 8, 2022
b73a65e
Added support for ParrelSync-based testing for Unity Services
pdeschain Feb 9, 2022
fedb5cc
Stop lobby tracking if left lobby (ie quit the game or went back to m…
pdeschain Feb 9, 2022
b5798ef
fixed bad default IP (used for localhost connection)
pdeschain Feb 9, 2022
dc4bd49
#
pdeschain Feb 9, 2022
0b19d6e
Fixed unclickable menu problem
pdeschain Feb 9, 2022
9bc30ab
Cleanup
pdeschain Feb 9, 2022
040457b
Connected existing relay logic with some minor alterations to the lob…
pdeschain Feb 10, 2022
8639f62
#
pdeschain Feb 10, 2022
813d59c
Got relay-based connection to work
pdeschain Feb 10, 2022
a2dba5f
Removed unnecessary data visualization
pdeschain Feb 10, 2022
10dca52
simplified mainmenustate prefab
pdeschain Feb 10, 2022
119c767
Bootstrap renamed to ApplicationController to better reflect it's intent
pdeschain Feb 10, 2022
89365df
Removed Identity system and replaced it with a simpled Auth service w…
pdeschain Feb 10, 2022
4f2aa93
Fixed a blocked UI bug
pdeschain Feb 11, 2022
0c6dd06
#
pdeschain Feb 11, 2022
620a4d9
applied formatting
pdeschain Feb 14, 2022
70eac40
Removed unused code
pdeschain Feb 14, 2022
f8345e8
accidentally reintroduced a class that was removed earlier
pdeschain Feb 14, 2022
3c56757
re-added lobby package
pdeschain Feb 14, 2022
addcd99
using cleanup and removal of unused enums
pdeschain Feb 14, 2022
01d16dd
review feedback wip
pdeschain Feb 16, 2022
86ac604
Update Assets/BossRoom/Scripts/Client/UI/UITinter.cs
pdeschain Feb 16, 2022
3cc2d69
Update Assets/BossRoom/Scripts/Client/UI/UITinter.cs
pdeschain Feb 16, 2022
b359cff
#
pdeschain Feb 16, 2022
d36f162
Merge branch 'pdeschain/lobby-integration' of github.com:Unity-Techno…
pdeschain Feb 16, 2022
d0cc992
Review comments wip
pdeschain Feb 16, 2022
937d55b
Build error fix
pdeschain Feb 16, 2022
1be1257
Removed verbs from Lobby-related UI class names
pdeschain Feb 16, 2022
209110f
Update Assets/BossRoom/Scripts/Client/Game/State/ClientMainMenuState.cs
pdeschain Feb 16, 2022
9ef5bca
#
pdeschain Feb 16, 2022
1c30fc4
Quit logic for lobbies has been moved to LobbyAsyncRequests
pdeschain Feb 16, 2022
ade24cc
Merge branch 'pdeschain/lobby-integration' of github.com:Unity-Techno…
pdeschain Feb 16, 2022
c73e7ff
Removed redundant cancellationtokensource-realted code
pdeschain Feb 17, 2022
05689c3
Minor API change for AuthenticationAPIInterface
pdeschain Feb 17, 2022
3c0399e
#
pdeschain Feb 17, 2022
6593689
Added BufferedMessageChannel - it would call the subscriber immediate…
pdeschain Feb 17, 2022
ae9b46b
#
pdeschain Feb 17, 2022
6161fca
Fun little regex mistake fixed
pdeschain Feb 17, 2022
23a4426
#
pdeschain Feb 17, 2022
87230f5
AuthenticationServiceFacade rename
pdeschain Feb 17, 2022
3695e8f
simpligied RateLimitCooldown class
pdeschain Feb 17, 2022
d41dbd6
Lobby API Wrapper refactorings
pdeschain Feb 17, 2022
960fb0a
#
pdeschain Feb 17, 2022
90999c2
#
pdeschain Feb 17, 2022
2621bd4
Bad regex kicking out '.'
pdeschain Feb 17, 2022
8a4d964
Fixing scene references after refactorings
pdeschain Feb 17, 2022
43b92e6
Fixed issue with OnlineMode not being set for a new lobby
pdeschain Feb 17, 2022
23a5675
Update ui for room name box immediately
pdeschain Feb 17, 2022
d133837
Leave lobby when quitting game or leaving char select
pdeschain Feb 17, 2022
e32caf1
Fixed DI bug where if you access the same object through different in…
pdeschain Feb 18, 2022
d264b42
#
pdeschain Feb 18, 2022
afd3687
naming fix
pdeschain Feb 18, 2022
79c09b1
Added 3 interface binding in DIScope
pdeschain Feb 18, 2022
19e1af3
Removed old PopupPanel prefab
pdeschain Feb 18, 2022
b5fb9d1
MainMenuState didn't have UICanvas set to autoinject
pdeschain Feb 18, 2022
a503054
Class naming fix
pdeschain Feb 18, 2022
20dc4e6
Cleaned up photon usage
pdeschain Feb 22, 2022
e8d6bb6
Code comments fix
pdeschain Feb 22, 2022
4bdb5c4
Added command line argument parsing which allows us to set a differen…
pdeschain Feb 23, 2022
fcdb7d7
MessageChannel internal action queue doc
pdeschain Feb 23, 2022
af34616
Naming and API tweaks
pdeschain Feb 23, 2022
d704711
UpdateRunner implementation cleaned up
pdeschain Feb 23, 2022
06429f6
preventing endless re-queing of fetch lobbies
pdeschain Feb 23, 2022
0a1c8d9
ui testing
pdeschain Feb 23, 2022
8a19825
#
pdeschain Feb 23, 2022
319d3bf
Update Assets/BossRoom/Scripts/Shared/Infrastructure/PubSub/MessageCh…
pdeschain Feb 23, 2022
d7ab53b
code style, renamings
pdeschain Feb 23, 2022
414f758
Merge branch 'pdeschain/lobby-integration' of github.com:Unity-Techno…
pdeschain Feb 23, 2022
f5050c5
Update Assets/BossRoom/Scripts/Client/UI/Lobby/LobbyCreationUI.cs
pdeschain Feb 23, 2022
cdf291a
#
pdeschain Feb 23, 2022
caa941d
#
pdeschain Feb 23, 2022
179dfe2
Merge branch 'pdeschain/lobby-integration' of github.com:Unity-Techno…
pdeschain Feb 23, 2022
56fd08d
Cleaned up the remainders of Photon package
pdeschain Feb 23, 2022
07dc054
relay package upgrade
pdeschain Feb 23, 2022
a49656c
code style pass
pdeschain Feb 23, 2022
5c2608d
Room Name -> Join Code rename in the char select UI
pdeschain Feb 23, 2022
6a47ed6
Increased the delay for lobby update slightly
pdeschain Feb 23, 2022
46917ca
LobbyJoiningUI InjectDependenciesAndInstantiate -> InjectDependencies…
pdeschain Feb 23, 2022
306886b
Added a filter and order usage within LobbyAPIInterface
pdeschain Feb 23, 2022
671ce6f
Removed Photon Transport form the NM prefab
pdeschain Feb 23, 2022
095bc81
#
pdeschain Feb 23, 2022
f807562
naming adjustment
pdeschain Feb 23, 2022
1181363
unused comment
pdeschain Feb 23, 2022
133479c
#
pdeschain Feb 23, 2022
6de1293
namespace adjustment
pdeschain Feb 23, 2022
df66eaa
LobbyUIMediator relayjoinedfailed logic moved into internal scope
pdeschain Feb 24, 2022
8e6465b
unlinked the project from project id
pdeschain Feb 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 9 additions & 62 deletions Assets/BossRoom/Prefabs/NetworkingManager.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5436007408952557925}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5486862276979889515
MonoBehaviour:
Expand All @@ -44,68 +44,17 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ProtocolType: 0
m_MaximumPacketSize: 2000
m_MaxPacketQueueSize: 512
m_SendQueueBatchSize: 16000
m_MaxPayloadSize: 16000
m_MaxSendQueueSize: 98304
m_HeartbeatTimeoutMS: 500
m_ConnectTimeoutMS: 1000
m_MaxConnectAttempts: 60
m_DisconnectTimeoutMS: 30000
ConnectionData:
Address: 127.0.0.1
Port: 7777
--- !u!1 &409269880
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 409269881}
- component: {fileID: 409269882}
m_Layer: 0
m_Name: PhotonTransport
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &409269881
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 409269880}
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: 5436007408952557925}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &409269882
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 409269880}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52c005b32a68a254cbe502a4e5cb8eb6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NickName:
m_RoomName:
m_MaxPlayers: 16
m_NetworkDeliveryEventCodesStartRange: 130
m_AttachSupportLogger: 0
m_BatchMode: 1
m_SendQueueBatchSize: 100000
m_BatchedTransportEventCode: 129
m_KickEventCode: 130
ServerListenAddress:
--- !u!1 &503411707
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -135,7 +84,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5436007408952557925}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &503411709
MonoBehaviour:
Expand All @@ -150,16 +99,17 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ProtocolType: 1
m_MaximumPacketSize: 1400
m_MaxPacketQueueSize: 256
m_SendQueueBatchSize: 32000
m_MaxPayloadSize: 32000
m_MaxSendQueueSize: 98304
m_HeartbeatTimeoutMS: 500
m_ConnectTimeoutMS: 1000
m_MaxConnectAttempts: 60
m_DisconnectTimeoutMS: 30000
ConnectionData:
Address: 127.0.0.1
Port: 7777
ServerListenAddress:
--- !u!1 &5436007408952557947
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -189,7 +139,6 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 409269881}
- {fileID: 1861090270400447367}
- {fileID: 347284043}
- {fileID: 503411708}
Expand All @@ -209,7 +158,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_IpHostTransport: {fileID: 5486862276979889515}
m_RelayTransport: {fileID: 409269882}
m_UnityRelayTransport: {fileID: 503411709}
--- !u!114 &5436007408952557924
MonoBehaviour:
Expand All @@ -223,7 +171,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
m_Name:
m_EditorClassIdentifier:
DontDestroy: 1
RunInBackground: 1
LogLevel: 1
NetworkConfig:
Expand Down Expand Up @@ -315,7 +262,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5436007408952557925}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7738483995325753316
MonoBehaviour:
Expand Down
83 changes: 79 additions & 4 deletions Assets/BossRoom/Prefabs/State/MainMenuState.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8576152884213668001}
- component: {fileID: 3747962111577947793}
- component: {fileID: 8576152884213668000}
- component: {fileID: 2665876610389888237}
- component: {fileID: 7369153188685295691}
- component: {fileID: 493749757375256148}
m_Layer: 0
m_Name: MainMenuState
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8576152884213668001
Transform:
--- !u!224 &3747962111577947793
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8576152884213668003}
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_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &8576152884213668000
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -43,3 +51,70 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab10fd7c6aa7d36438f5ac1c0ebfadbb, type: 3}
m_Name:
m_EditorClassIdentifier:
_autoInjected:
- {fileID: 0}
m_NameGenerationData: {fileID: 11400000, guid: cc0e4025ad893614a8db0d9c10bf7c4f, type: 2}
m_lobbyUIMediator: {fileID: 0}
m_mainMenuButtons: {fileID: 0}
m_signInSpinner: {fileID: 0}
--- !u!223 &2665876610389888237
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8576152884213668003}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &7369153188685295691
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8576152884213668003}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0.506
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!114 &493749757375256148
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8576152884213668003}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
18 changes: 9 additions & 9 deletions Assets/BossRoom/Prefabs/UI/CharacterSelectCanvas.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Room Name: '
m_text: 'Join Code: '
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9641ce046d2227445b9684161a165f68, type: 2}
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68, type: 2}
Expand Down Expand Up @@ -3757,14 +3757,14 @@ PrefabInstance:
objectReference: {fileID: 21300000, guid: bb7d37d2a40813048883c2696e975eac, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ff848390065bf914fb60582f4d872815, type: 3}
--- !u!224 &4148434299776943719 stripped
--- !u!224 &8367260898428394609 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7773346133266671123, guid: ff848390065bf914fb60582f4d872815, type: 3}
m_CorrespondingSourceObject: {fileID: 2768642224677944325, guid: ff848390065bf914fb60582f4d872815, type: 3}
m_PrefabInstance: {fileID: 5940892340993679476}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8367260898428394609 stripped
--- !u!224 &4148434299776943719 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2768642224677944325, guid: ff848390065bf914fb60582f4d872815, type: 3}
m_CorrespondingSourceObject: {fileID: 7773346133266671123, guid: ff848390065bf914fb60582f4d872815, type: 3}
m_PrefabInstance: {fileID: 5940892340993679476}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5940892341121358677
Expand Down Expand Up @@ -4829,14 +4829,14 @@ PrefabInstance:
objectReference: {fileID: 21300000, guid: 9781ab5273dea1c4e94c1ab8d4d18b31, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ff848390065bf914fb60582f4d872815, type: 3}
--- !u!224 &8367260899810866543 stripped
--- !u!224 &4148434300538892153 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2768642224677944325, guid: ff848390065bf914fb60582f4d872815, type: 3}
m_CorrespondingSourceObject: {fileID: 7773346133266671123, guid: ff848390065bf914fb60582f4d872815, type: 3}
m_PrefabInstance: {fileID: 5940892341839497578}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4148434300538892153 stripped
--- !u!224 &8367260899810866543 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7773346133266671123, guid: ff848390065bf914fb60582f4d872815, type: 3}
m_CorrespondingSourceObject: {fileID: 2768642224677944325, guid: ff848390065bf914fb60582f4d872815, type: 3}
m_PrefabInstance: {fileID: 5940892341839497578}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5940892341869088767
Expand Down
Loading