read1
This commit is contained in:
parent
74d86ce2fe
commit
84a4c88435
|
|
@ -2703,7 +2703,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 676719530}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
|
@ -4155,9 +4155,9 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 891873712}
|
||||
- {fileID: 558548932}
|
||||
- {fileID: 1416132164}
|
||||
- {fileID: 2097873574}
|
||||
- {fileID: 1150166933}
|
||||
- {fileID: 1841278905}
|
||||
m_Father: {fileID: 897556311}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -5337,7 +5337,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 4, y: 98.12, z: 0}
|
||||
--- !u!114 &704599430
|
||||
MonoBehaviour:
|
||||
|
|
@ -6327,6 +6327,43 @@ Transform:
|
|||
m_Father: {fileID: 866723416}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: -17.425161, y: -2.9569004, z: 98.42855}
|
||||
--- !u!1 &842124192
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 842124193}
|
||||
m_Layer: 5
|
||||
m_Name: Sliding Area
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &842124193
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 842124192}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1024513960}
|
||||
m_Father: {fileID: 1181018072}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -20, y: -20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &844913155
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6678,7 +6715,7 @@ MonoBehaviour:
|
|||
type: 3}
|
||||
SeperatorListItemPrefab: {fileID: 6448077394246137789, guid: 9bae492e5ab6d7e499ad6cbafda50dbd,
|
||||
type: 3}
|
||||
FriendsListParent: {fileID: 1416132164}
|
||||
FriendsListParent: {fileID: 1794723306}
|
||||
ToggleRequestsButton: {fileID: 558548935}
|
||||
AddFriendUsernameInput: {fileID: 920560642}
|
||||
AddFriendErrorTxt: {fileID: 1507594641}
|
||||
|
|
@ -6772,7 +6809,7 @@ RectTransform:
|
|||
- {fileID: 585456424}
|
||||
- {fileID: 67511721}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
|
@ -7991,6 +8028,82 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 997132334}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1024513959
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1024513960}
|
||||
- component: {fileID: 1024513962}
|
||||
- component: {fileID: 1024513961}
|
||||
m_Layer: 5
|
||||
m_Name: Handle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1024513960
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1024513959}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 842124193}
|
||||
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: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1024513961
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1024513959}
|
||||
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: 0.14117648}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
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!222 &1024513962
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1024513959}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1060127986
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8921,7 +9034,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 72451067}
|
||||
m_Father: {fileID: 585456424}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -9053,6 +9166,133 @@ Transform:
|
|||
m_Father: {fileID: 287735799}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1181018071
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1181018072}
|
||||
- component: {fileID: 1181018075}
|
||||
- component: {fileID: 1181018074}
|
||||
- component: {fileID: 1181018073}
|
||||
m_Layer: 5
|
||||
m_Name: Scrollbar Vertical
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1181018072
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1181018071}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 842124193}
|
||||
m_Father: {fileID: 1841278905}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 7.7900085, y: 0}
|
||||
m_SizeDelta: {x: 20, y: -17}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!114 &1181018073
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1181018071}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 1024513961}
|
||||
m_HandleRect: {fileID: 1024513960}
|
||||
m_Direction: 2
|
||||
m_Value: 0
|
||||
m_Size: 1
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1181018074
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1181018071}
|
||||
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: 0, g: 0, b: 0, a: 0.18431373}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
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!222 &1181018075
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1181018071}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1181232895
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10015,7 +10255,7 @@ SkinnedMeshRenderer:
|
|||
m_Center: {x: -0.8235929, y: 0.0010846108, z: -0.0023797378}
|
||||
m_Extent: {x: 0.11325467, y: 0.15198018, z: 0.11642456}
|
||||
m_DirtyAABB: 0
|
||||
--- !u!1 &1416132163
|
||||
--- !u!1 &1366229758
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -10023,84 +10263,72 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1416132164}
|
||||
- component: {fileID: 1416132167}
|
||||
- component: {fileID: 1416132166}
|
||||
- component: {fileID: 1416132165}
|
||||
- component: {fileID: 1366229759}
|
||||
- component: {fileID: 1366229762}
|
||||
- component: {fileID: 1366229761}
|
||||
- component: {fileID: 1366229760}
|
||||
m_Layer: 5
|
||||
m_Name: ListParent
|
||||
m_Name: Viewport
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1416132164
|
||||
--- !u!224 &1366229759
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1416132163}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_GameObject: {fileID: 1366229758}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 585456424}
|
||||
m_RootOrder: 2
|
||||
m_Children:
|
||||
- {fileID: 1794723306}
|
||||
m_Father: {fileID: 1841278905}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 35.950005}
|
||||
m_SizeDelta: {x: -140, y: -173.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1416132165
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &1366229760
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1416132163}
|
||||
m_GameObject: {fileID: 1366229758}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!114 &1416132166
|
||||
m_ShowMaskGraphic: 0
|
||||
--- !u!114 &1366229761
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1416132163}
|
||||
m_GameObject: {fileID: 1366229758}
|
||||
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: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -10110,13 +10338,13 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &1416132167
|
||||
--- !u!222 &1366229762
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1416132163}
|
||||
m_GameObject: {fileID: 1366229758}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1452289284
|
||||
GameObject:
|
||||
|
|
@ -11612,7 +11840,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1612553631
|
||||
GameObject:
|
||||
|
|
@ -12649,6 +12877,84 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1788903747}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1794723305
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1794723306}
|
||||
- component: {fileID: 1794723308}
|
||||
- component: {fileID: 1794723307}
|
||||
m_Layer: 5
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1794723306
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1794723305}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1366229759}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &1794723307
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1794723305}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 1
|
||||
--- !u!114 &1794723308
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1794723305}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &1806800916
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -12786,6 +13092,115 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1806800916}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1841278904
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1841278905}
|
||||
- component: {fileID: 1841278908}
|
||||
- component: {fileID: 1841278907}
|
||||
- component: {fileID: 1841278906}
|
||||
m_Layer: 5
|
||||
m_Name: Scroll View
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1841278905
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1841278904}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1366229759}
|
||||
- {fileID: 1181018072}
|
||||
m_Father: {fileID: 585456424}
|
||||
m_RootOrder: 4
|
||||
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: 1.1515, y: 39.052}
|
||||
m_SizeDelta: {x: 850.2, y: 373.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1841278906
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1841278904}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Content: {fileID: 1794723306}
|
||||
m_Horizontal: 0
|
||||
m_Vertical: 1
|
||||
m_MovementType: 1
|
||||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_Viewport: {fileID: 1366229759}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 1181018073}
|
||||
m_HorizontalScrollbarVisibility: 2
|
||||
m_VerticalScrollbarVisibility: 2
|
||||
m_HorizontalScrollbarSpacing: -3
|
||||
m_VerticalScrollbarSpacing: -3
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1841278907
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1841278904}
|
||||
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: 0}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
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!222 &1841278908
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1841278904}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1852693765
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -13868,7 +14283,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 325320297}
|
||||
m_Father: {fileID: 585456424}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
|
|
@ -14067,7 +14482,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2106302877
|
||||
GameObject:
|
||||
|
|
@ -87268,7 +87683,7 @@ Transform:
|
|||
- {fileID: 1978960903402541526}
|
||||
- {fileID: 1978960903338765587}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &2088569657472435773
|
||||
Transform:
|
||||
|
|
@ -102794,7 +103209,7 @@ Transform:
|
|||
- {fileID: 1477774189}
|
||||
- {fileID: 1978960902630167361}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -80.929, z: 0}
|
||||
--- !u!1 &3133200754732606562
|
||||
GameObject:
|
||||
|
|
@ -107512,7 +107927,7 @@ PrefabInstance:
|
|||
- target: {fileID: 3480662763998495656, guid: a8793a6d6dcedb04da398a45f566101a,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3480662763998495656, guid: a8793a6d6dcedb04da398a45f566101a,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -89249,7 +89249,7 @@ MeshRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 2affdac866d85a241adaa99d033b1d64, type: 2}
|
||||
- {fileID: 2100000, guid: 6c778282b7b2fc74cb02275c9c46f737, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -173406,7 +173406,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 3.0 FPS
|
||||
m_Text: 8.1 FPS
|
||||
updateInterval: 0.5
|
||||
--- !u!224 &7128957315697809924
|
||||
RectTransform:
|
||||
|
|
@ -204765,7 +204765,7 @@ MeshRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 2affdac866d85a241adaa99d033b1d64, type: 2}
|
||||
- {fileID: 2100000, guid: a6457600b879cdb45a78508bb63049ca, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
|
|||
|
|
@ -24,7 +24,11 @@ public class FriendsManager : MonoBehaviour
|
|||
[SerializeField]private TMP_InputField AddFriendUsernameInput;
|
||||
[SerializeField]private TMP_Text AddFriendErrorTxt;
|
||||
[SerializeField]private Button AddFriendBtn;
|
||||
|
||||
|
||||
public static FriendsManager instance;
|
||||
void Awake(){
|
||||
instance = this;
|
||||
canvasGroup = GetComponent<CanvasGroup>();
|
||||
|
||||
AddFriendBtn.onClick.AddListener(AddFriend);
|
||||
|
|
@ -54,8 +58,12 @@ public class FriendsManager : MonoBehaviour
|
|||
}
|
||||
|
||||
StartCoroutine(CoroutineAddFriend(AddFriendUsernameInput.text));
|
||||
AddFriendUsernameInput.text = "";
|
||||
}
|
||||
|
||||
public void OnPlayersChanged(){
|
||||
PopulateFriendList();
|
||||
}
|
||||
|
||||
void PopulateFriendList(){
|
||||
foreach(Photon.Realtime.Player player in PhotonNetwork.PlayerList){
|
||||
|
|
@ -92,6 +100,9 @@ public class FriendsManager : MonoBehaviour
|
|||
|
||||
newFriendListItem.transform.GetChild(1).gameObject.SetActive(isOnline);
|
||||
newFriendListItem.transform.GetChild(1).GetComponent<Button>().onClick.AddListener(()=>{StartCoroutine(CoroutineInviteFriend(fid));});
|
||||
|
||||
newFriendListItem.transform.GetChild(1).GetComponent<Button>().interactable = PhotonNetwork.CurrentRoom.PlayerCount < 3;
|
||||
|
||||
newFriendListItem.transform.GetChild(2).gameObject.SetActive(!isOnline);
|
||||
newFriendListItem.transform.GetChild(2).GetComponent<TMP_Text>().text = "Last seen " + (last_seen_diff.Hours <=0 ? $"{(last_seen_diff.Minutes == 0 ? 1 : last_seen_diff.Minutes)} Mins" : $"{last_seen_diff.Hours} hours") + " Ago";
|
||||
}
|
||||
|
|
@ -107,11 +118,25 @@ public class FriendsManager : MonoBehaviour
|
|||
|
||||
WWW req= new(UserDataManager.GetApiUrl("friend_request"), form);
|
||||
yield return req;
|
||||
AddFriendErrorTxt.text =req.text;
|
||||
string pureq = req.text.Replace(" ", "");
|
||||
if(pureq == "0" || pureq == "1"){
|
||||
//Success
|
||||
AddFriendPanel.SetActive(false);
|
||||
mainPanel.SetActive(true);
|
||||
}else if(pureq == "7"){
|
||||
AddFriendErrorTxt.text ="Invalid username";
|
||||
}else if(pureq == "5"){
|
||||
AddFriendErrorTxt.text ="You guys are already friends!";
|
||||
}else if(pureq == "4"){
|
||||
AddFriendErrorTxt.text ="You've already sent a friend request to this user";
|
||||
}else{
|
||||
AddFriendErrorTxt.text ="Something went wrong";
|
||||
}
|
||||
|
||||
if(req.text.Length <=0){
|
||||
AddFriendErrorTxt.text ="Server 500";
|
||||
}
|
||||
|
||||
canvasGroup.interactable = true;
|
||||
}
|
||||
|
||||
|
|
@ -121,6 +146,7 @@ public class FriendsManager : MonoBehaviour
|
|||
WWWForm form = new WWWForm();
|
||||
form.AddField("uid", UserDataManager.instance.UserID);
|
||||
form.AddField("fid", fid);
|
||||
form.AddField("lobby", PhotonNetwork.CurrentRoom.Name);
|
||||
Debug.Log("inviting " + fid + " to this session");
|
||||
WWW req = new WWW(UserDataManager.GetApiUrl("invite_lobby"),form);
|
||||
yield return req;
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ public class GameManager : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
|
||||
|
||||
|
||||
localPlayer = PhotonNetwork.Instantiate("Player", GetRandomSpawnPoint().position, Quaternion.identity).GetComponentInChildren<PlayerController>();
|
||||
localPlayer = PhotonNetwork.Instantiate("Player", SpawnPositions[customPlayerId].position, Quaternion.identity).GetComponentInChildren<PlayerController>();
|
||||
// localPlayer.GetComponent<PlayerNetwork>().SetPartyName(partyName,partyId);
|
||||
UIManager.instance.RoundLength = DeathmatchRoundLength;
|
||||
localPlayer.GetComponent<PlayerNetwork>().AutoAssignParty();
|
||||
|
|
@ -365,7 +365,7 @@ public class GameManager : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
StartCoroutine(HideRoomIn((float)DeathmatchRoundLength /2f));
|
||||
}
|
||||
InventoryManager.ResetStocks();
|
||||
if(desiredGameMode == GameModes.Deathmatch.ToString()){
|
||||
if(desiredGameMode == GameModes.Deathmatch.ToString() || desiredGameMode == GameModes.TeamDeathmatch.ToString()){
|
||||
InventoryManager.instance.GiveDefaultLoots(DeathmatchDefaultInventory);
|
||||
}
|
||||
|
||||
|
|
@ -375,7 +375,9 @@ public class GameManager : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
}
|
||||
|
||||
IEnumerator HideRoomIn(float length){
|
||||
yield return new WaitForSeconds(length);
|
||||
yield return new WaitForSeconds(length);
|
||||
|
||||
Debug.Log("Hiding this room");
|
||||
|
||||
PhotonNetwork.CurrentRoom.IsOpen = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,6 +68,10 @@ public class MainMenu : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
base.OnJoinedRoom();
|
||||
|
||||
Debug.Log("Connected to new room : " + PhotonNetwork.CurrentRoom.Name);
|
||||
if(PhotonNetwork.CurrentRoom.PlayerCount >3 ){
|
||||
Debug.Log("NO room for me!");
|
||||
JoinAnotherRoom(myRoomname);
|
||||
}
|
||||
loadingPanel.SetActive(false);
|
||||
|
||||
UpdateLobbyPlayers();
|
||||
|
|
@ -136,10 +140,10 @@ public class MainMenu : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
if(val.ToLower()== "tdm"){gameMode = GameModes.TeamDeathmatch;}
|
||||
if(val.ToLower() == "br"){gameMode = GameModes.BattleRoyale;}
|
||||
|
||||
btnPlay.interactable = gameMode != GameModes.BattleRoyale;
|
||||
|
||||
Debug.Log("Set game mode to : " + gameMode.ToString() + $" ({val})");
|
||||
GameManager.desiredGameMode = gameMode.ToString();
|
||||
UpdatePlayBtnInteractability();
|
||||
}
|
||||
|
||||
void OnInvitesUpdated(){
|
||||
|
|
@ -154,7 +158,7 @@ public class MainMenu : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
GameObject newInviteItem = Instantiate(InviteListItemPrefab, InviteListParent);
|
||||
newInviteItem.transform.GetChild(0).GetComponent<TMP_Text>().text = $"Lobby Invite from <color=green>{invite.host}";
|
||||
|
||||
newInviteItem.transform.GetChild(1).GetComponent<Button>().onClick.AddListener(()=>{ JoinFriendsLobby(invite.host, invite.host_id,invite.id); });
|
||||
newInviteItem.transform.GetChild(1).GetComponent<Button>().onClick.AddListener(()=>{ JoinFriendsLobby(invite.host, invite.lobby,invite.id); });
|
||||
newInviteItem.transform.GetChild(2).GetComponent<Button>().onClick.AddListener(()=>{ StartCoroutine(CoroutineDeleteInvite(invite.id)); });
|
||||
}
|
||||
}
|
||||
|
|
@ -172,12 +176,10 @@ public class MainMenu : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
|
||||
|
||||
|
||||
void JoinFriendsLobby(string hostname, int hostid, int inviteid){
|
||||
void JoinFriendsLobby(string hostname, string lobby, int inviteid){
|
||||
StartCoroutine(CoroutineDeleteInvite(inviteid));
|
||||
|
||||
string roomName = hostname+"#"+hostid;
|
||||
|
||||
JoinAnotherRoom(roomName);
|
||||
JoinAnotherRoom(lobby);
|
||||
}
|
||||
public void JoinAnotherRoom(string roomname){
|
||||
if(PhotonNetwork.InRoom){
|
||||
|
|
@ -192,7 +194,7 @@ public class MainMenu : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
void JoinQueuedRoom(){
|
||||
loadingPanel.SetActive(true);
|
||||
if(queuedRoomname.Length >0){
|
||||
PhotonNetwork.JoinOrCreateRoom(queuedRoomname, new RoomOptions(){IsOpen=true, IsVisible=true}, TypedLobby.Default);
|
||||
PhotonNetwork.JoinOrCreateRoom(queuedRoomname, new RoomOptions(){IsOpen=true, IsVisible=true, MaxPlayers = 8}, TypedLobby.Default);
|
||||
}
|
||||
|
||||
queuedRoomname="";
|
||||
|
|
@ -234,8 +236,14 @@ public class MainMenu : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
|
||||
//Uodate cotrols
|
||||
|
||||
btnPlay.interactable=PhotonNetwork.IsMasterClient;
|
||||
UpdatePlayBtnInteractability();
|
||||
GameModeSelector.SetInteractable(PhotonNetwork.IsMasterClient);
|
||||
|
||||
FriendsManager.instance.OnPlayersChanged();
|
||||
}
|
||||
|
||||
void UpdatePlayBtnInteractability(){
|
||||
btnPlay.interactable = PhotonNetwork.IsMasterClient && GameManager.desiredGameMode != GameModes.BattleRoyale.ToString();
|
||||
}
|
||||
|
||||
IEnumerator CoroutineDeleteInvite(int inviteId){
|
||||
|
|
@ -316,6 +324,7 @@ public class MainMenu : MonoBehaviourPunCallbacks, IOnEventCallback
|
|||
bool foundRoom =false;
|
||||
List<string> suitableRooms = new List<string>();
|
||||
foreach(RoomInfo room in RoomList){
|
||||
Debug.Log($"roomname : {room.Name}, players: {room.PlayerCount}" );
|
||||
if(room.Name.Contains(roomnameBase)){
|
||||
//Suitable Room
|
||||
suitableRooms.Add(room.Name);
|
||||
|
|
|
|||
|
|
@ -79,13 +79,15 @@ public class UserDataManager : MonoBehaviour
|
|||
Invites = new List<Invite>();
|
||||
try{
|
||||
Invites = JsonConvert.DeserializeObject<List<Invite>>(response);
|
||||
|
||||
|
||||
}catch(Exception e){
|
||||
Debug.LogError("Couldn't parse invites");
|
||||
Debug.LogError(e.ToString());
|
||||
}
|
||||
|
||||
foreach(Invite invite in Invites){
|
||||
Debug.Log($"invite id {invite.id} is {DateTime.Now.Subtract(invite.time).TotalMinutes} old");
|
||||
}
|
||||
|
||||
OnInvitesUpdated.Invoke();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ public class PlayerController : MonoBehaviourPunCallbacks
|
|||
|
||||
Debug.Log(GameManager.desiredGameMode);
|
||||
//Setup Gamemode
|
||||
if (GameManager.desiredGameMode == GameModes.Deathmatch.ToString())
|
||||
if (GameManager.desiredGameMode == GameModes.Deathmatch.ToString() || GameManager.desiredGameMode == GameModes.TeamDeathmatch.ToString())
|
||||
{
|
||||
Debug.Log("Preparing Deathmatch");
|
||||
InventoryManager.instance.GiveDefaultLoots(GameManager.instance.DeathmatchDefaultInventory);
|
||||
|
|
|
|||
|
|
@ -38,6 +38,19 @@ public class PlayerNetwork : MonoBehaviourPunCallbacks, IPunObservable
|
|||
public AnimationCurve DistanceDamageCurve;
|
||||
public float BulletEffectiveRange;
|
||||
List<HitBox> hitboxes = new List<HitBox>();
|
||||
|
||||
public override void OnPlayerEnteredRoom(Player newPlayer)
|
||||
{
|
||||
base.OnPlayerEnteredRoom(newPlayer);
|
||||
AutoAssignParty();
|
||||
}
|
||||
|
||||
public override void OnPlayerLeftRoom(Player otherPlayer)
|
||||
{
|
||||
base.OnPlayerLeftRoom(otherPlayer);
|
||||
AutoAssignParty();
|
||||
}
|
||||
|
||||
public void RegisterHitbox(HitBox hitBox){
|
||||
if(hitboxes == null){hitboxes = new List<HitBox>();}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ public class Invite{
|
|||
public int id;
|
||||
public string host;
|
||||
public int host_id;
|
||||
public string lobby;
|
||||
public DateTime time;
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user