From d3fd9e962018bd9f44049804ad74ffd620ff08fd Mon Sep 17 00:00:00 2001 From: Nim-XD <165881403+IndieDevDungeon@users.noreply.github.com> Date: Sat, 7 Jun 2025 23:53:54 +0530 Subject: [PATCH] changesparty --- .DS_Store | Bin 14340 -> 14340 bytes Assets/.DS_Store | Bin 18436 -> 18436 bytes Assets/GFX/Characters/char1.prefab | 51 +- Assets/MultiplayerPrefab/char1.prefab | 1062 ++++++++++++++++- Assets/{ => Script}/ClickWorldObj.cs | 0 Assets/{ => Script}/ClickWorldObj.cs.meta | 0 Assets/{ => Script}/CraftManager.cs | 0 Assets/{ => Script}/CraftManager.cs.meta | 0 Assets/{ => Script}/CraftStation.cs | 0 Assets/{ => Script}/CraftStation.cs.meta | 0 Assets/Script/FarmingManager.cs | 2 +- Assets/{ => Script}/InGameCharacterMgr.cs | 0 .../{ => Script}/InGameCharacterMgr.cs.meta | 0 Assets/{ => Script}/LostNpc.cs | 0 Assets/{ => Script}/LostNpc.cs.meta | 0 Assets/{ => Script}/autoDisableGameObj.cs | 0 .../{ => Script}/autoDisableGameObj.cs.meta | 0 Assets/Script/cameraRPG.cs | 2 + Assets/Script/invitePlayer.cs | 151 +++ Assets/{ => Script}/invitePlayer.cs.meta | 0 Assets/Script/playerNetwork.cs | 58 +- Assets/invitePlayer.cs | 99 -- Packages/manifest.json | 97 +- Packages/packages-lock.json | 9 + 24 files changed, 1336 insertions(+), 195 deletions(-) rename Assets/{ => Script}/ClickWorldObj.cs (100%) rename Assets/{ => Script}/ClickWorldObj.cs.meta (100%) rename Assets/{ => Script}/CraftManager.cs (100%) rename Assets/{ => Script}/CraftManager.cs.meta (100%) rename Assets/{ => Script}/CraftStation.cs (100%) rename Assets/{ => Script}/CraftStation.cs.meta (100%) rename Assets/{ => Script}/InGameCharacterMgr.cs (100%) rename Assets/{ => Script}/InGameCharacterMgr.cs.meta (100%) rename Assets/{ => Script}/LostNpc.cs (100%) rename Assets/{ => Script}/LostNpc.cs.meta (100%) rename Assets/{ => Script}/autoDisableGameObj.cs (100%) rename Assets/{ => Script}/autoDisableGameObj.cs.meta (100%) create mode 100644 Assets/Script/invitePlayer.cs rename Assets/{ => Script}/invitePlayer.cs.meta (100%) delete mode 100644 Assets/invitePlayer.cs diff --git a/.DS_Store b/.DS_Store index a70ac979385782dcfed0224f0caee74af4b3f631..29c0180f5f56010ddcf8af775070d8eafea515cc 100644 GIT binary patch delta 292 zcmZoEXeromU684K@8p|;a;%Tc?Ov!){v)W!x@#%}kfkJ~%=lokn~<}e?R^FY1{MY% zhJ1!}hT`0O7nh`*{3M_l$7$bRyHwsDb3~O-L6M()Tu6>_!scf}v)L77EtZ0nhA^Zu z8`WKt|5APOLMdrh2FUH&vL6;PMC;VUsV&Fbq!4&n*C&$#Cxcg3SjM8o3!6HaqDY;syZG C2wHIf delta 292 zcmZoEXeromU685b{N$U0a;)c99v6_G{6|m`%2ELq0<~ zLve1ti%U{YeiBfOfq09?(6R w3?<0MEZX0yrT}vhTpr;fZ1M#ehQZ1Cxgawc&Ye%#d_bX*n~`y|lg=S-0N2P`Pyhe` diff --git a/Assets/.DS_Store b/Assets/.DS_Store index 4409619d56232d1b38e14148af9cc42469cf5bbe..ffa56c5ad425608e31113a1d146b80901dae0ea7 100644 GIT binary patch delta 1109 zcmbu7UrZcT6vpp&Sz$&Pxy%0xtZcg!M9CHe3?j$^wuHiVTXzc!MeV>0Wdba?vp}sT zM8!1Glu)P9^hK+Er3AWZ6Qw3lUyNvs6@Ac$#@Hu~eXwcmQ}r^lX!OMg=V9)A=bSln z&iualMa(Z^rOkz)^E zs-19vxAW(>Ki#96iO`fD+a7Df$?fBve83!4<9cW|rpG1rnG-)C;?}P8d}miLKO{;0 z+b!BOP1m+qjyw0+Fy}8YX2fQUgqjdzgvBv!vg?v0`2y9>fAj^6^Y)X^(S$@|>Vz)m z?a0&#B9Suk2x%hiq?f3~B(IPKa*iy`kqz=W*(BeSpU5q8kK9K(GLeOBFmM#36dqJy zFPhPURs_(6Bj`mRjzPx=Mqwb1S)9O0yo`CgiMMbX3wRgr<2*jZ1uWq*uHYklj8AbL z-{4z(ha31Azu;Hg!tb<0rVr9gnn&|#0rk=<+DxCOtu#Q}=m8q0gH)wM&JGl*U7q{r zZq&5KGQ5_%W|y^4*N{m_s!qyGu9g(Kl9gEn<+vt%TKrH~caL)Lzf3CsWl}4|N7Ixt zuhmgoF~^HbN$V#L-S&;Cx)X@mVux}E%Q)YfWK*<2@r2qPjWMlpb4XoBN$o1%#X zW(3Js@fu#o8#skUoWa{Ti+60AAJ{Z6Vi_yAgf(2nCs@ZdY~l-iiLdar;QIq^3a-E5 g_P>yYc93PH5>~dWGI{gyAG4AffxE8cT75>^pA_cw<^TWy delta 1111 zcma))UrZcT6vodtEZsXJ&`U*FW}rxS+g-?(LTO8AYgxLbuEmy8Ah5KN?lMz5ahZjk zfu@bR#MEf~i;gc^|3n|vH0s8fs3qaS*qCTytxb$3HSt9se5fY+QjK?K)@TzSoQJvj zzBA{}x%c;-U%~kmyfYYR>B!FKOxx-1{svN2pn6@9$%;~=PNk=hr`@+hNf*s6?zZOk z(8b!ujp1m#XV;#@(4iy8uGX#R^&6B1#ob)pRcs11*QuJ?I=N)pW;SO`oH2FhbUI_t z8kTNa_cI=5Q;S)1VbOHXdaZ40yK+L$IL6_;Zk{p?o$>c&uM$z))#K$#vS5g}&X{M% z)J|pGHqRN1XZ#PhD%+It2TV(si`@3D?aB^yBA3Y;IhpHzU!T&iPA(Y*+ss=sANI|? z%06{!Ha|CKSdJ~%BktRSYEr$g{Ofx&wlgwsSmm+S{Mtb^rB2(YGX-PhjAaxUzwG8_Rz96RdE~Q-^Wh`CZb5Pd}{c2sPxoK=%RcAOittHdRIAX3bu`JsB z3S+E+Zha6=bo$P?m6)4{?A-$cc<<-l=@dLH*Ki( zf_Qtw9gS^~j;`Lmy@T#*{|FP8uWCx`M%V7yQjVt(o5D<_f>)Qp2pNqDIn3AjQj2e8 zB7$7l_AH+j=7|VD>0DTHiV+GIS0$vtqU-QtG@G;i>v84(g8vgqj{)*4u V>kZaEx4gd;O#Buo4eSh7{RQR7_aXoQ diff --git a/Assets/GFX/Characters/char1.prefab b/Assets/GFX/Characters/char1.prefab index 565ad64c..cbf9ccd7 100644 --- a/Assets/GFX/Characters/char1.prefab +++ b/Assets/GFX/Characters/char1.prefab @@ -2273,7 +2273,8 @@ MonoBehaviour: PrimaryWeapon: {fileID: 21300000, guid: 1fde2e89cec53e640997f2e11b658532, type: 3} SecondaryWeapon: {fileID: 0} Cape: {fileID: 0} - Back: {fileID: 0} + Quiver: {fileID: 0} + Backpack: {fileID: 0} Shield: [] Armor: - {fileID: 21300040, guid: 932eb8d5023602e45bd0f3d4e1206516, type: 3} @@ -2355,8 +2356,8 @@ MonoBehaviour: LeggingsRenderers: - {fileID: 5460818288070623950} - {fileID: 7939274065524057377} - CapeRenderer: {fileID: 0} - BackRenderer: {fileID: 0} + QuiverRenderer: {fileID: 0} + BackpackRenderer: {fileID: 0} ShieldRenderers: - {fileID: 2816459151010776475} BowRenderers: @@ -2365,7 +2366,7 @@ MonoBehaviour: - {fileID: 2277310147209446500} - {fileID: 5449786263906794857} - {fileID: 4698824689103266890} - FirearmsRenderers: [] + CrossbowRenderers: [] MakeupRenderer: {fileID: 5665153843562924393} MaskRenderer: {fileID: 1330441514144925353} EarringsRenderers: @@ -2397,6 +2398,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6dbda98e8614ec8a935809c1a0ace8a, type: 3} m_Name: m_EditorClassIdentifier: + SortingGroup: {fileID: 2642874521782211868} Sprites: - {fileID: 3435519960737444863} - {fileID: 770255024123046226} @@ -2433,8 +2435,6 @@ MonoBehaviour: - {fileID: 1330441514144925353} - {fileID: 5449786263906794857} - {fileID: 4698824689103266890} - SortingGroup: {fileID: 2642874521782211868} - SortingOrderStep: 10 CopyTo: {fileID: 0} --- !u!114 &843127271529294997 MonoBehaviour: @@ -4926,6 +4926,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6dbda98e8614ec8a935809c1a0ace8a, type: 3} m_Name: m_EditorClassIdentifier: + SortingGroup: {fileID: 2642874521782211868} Sprites: - {fileID: 6684673773296626903} - {fileID: 4194971619543077301} @@ -5081,8 +5082,6 @@ MonoBehaviour: - {fileID: 1330441514144925353} - {fileID: 5449786263906794857} - {fileID: 4698824689103266890} - SortingGroup: {fileID: 2642874521782211868} - SortingOrderStep: 10 CopyTo: {fileID: 0} --- !u!95 &8745129960027346450 Animator: @@ -6474,7 +6473,8 @@ MonoBehaviour: PrimaryWeapon: {fileID: 21300000, guid: 1fde2e89cec53e640997f2e11b658532, type: 3} SecondaryWeapon: {fileID: 0} Cape: {fileID: 0} - Back: {fileID: 0} + Quiver: {fileID: 0} + Backpack: {fileID: 0} Shield: [] Armor: - {fileID: 21300040, guid: 932eb8d5023602e45bd0f3d4e1206516, type: 3} @@ -6555,8 +6555,8 @@ MonoBehaviour: LeggingsRenderers: - {fileID: 6960788829903527684} - {fileID: 3231806984399289353} - CapeRenderer: {fileID: 0} - BackRenderer: {fileID: 0} + QuiverRenderer: {fileID: 0} + BackpackRenderer: {fileID: 0} ShieldRenderers: - {fileID: 7311041767872155725} - {fileID: 6980468645066611400} @@ -6566,7 +6566,7 @@ MonoBehaviour: - {fileID: 7360430681077632512} - {fileID: 1364851250167138380} - {fileID: 3800483606247586909} - FirearmsRenderers: [] + CrossbowRenderers: [] MakeupRenderer: {fileID: 3435998627430565249} MaskRenderer: {fileID: 7780066744865994545} EarringsRenderers: @@ -6598,6 +6598,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6dbda98e8614ec8a935809c1a0ace8a, type: 3} m_Name: m_EditorClassIdentifier: + SortingGroup: {fileID: 2642874521782211868} Sprites: - {fileID: 6684673773296626903} - {fileID: 8761156241998211234} @@ -6638,8 +6639,6 @@ MonoBehaviour: - {fileID: 7311041767872155725} - {fileID: 6980468645066611400} - {fileID: 1364851250167138380} - SortingGroup: {fileID: 2642874521782211868} - SortingOrderStep: 10 CopyTo: {fileID: 0} --- !u!114 &7345451240784811756 MonoBehaviour: @@ -9910,7 +9909,8 @@ MonoBehaviour: PrimaryWeapon: {fileID: 21300000, guid: 1fde2e89cec53e640997f2e11b658532, type: 3} SecondaryWeapon: {fileID: 0} Cape: {fileID: 0} - Back: {fileID: 0} + Quiver: {fileID: 0} + Backpack: {fileID: 0} Shield: [] Armor: - {fileID: 21300040, guid: 932eb8d5023602e45bd0f3d4e1206516, type: 3} @@ -9991,8 +9991,8 @@ MonoBehaviour: LeggingsRenderers: - {fileID: 5182926700030229988} - {fileID: 582777995261747491} - CapeRenderer: {fileID: 0} - BackRenderer: {fileID: 0} + QuiverRenderer: {fileID: 0} + BackpackRenderer: {fileID: 0} ShieldRenderers: - {fileID: 2787766321566281354} - {fileID: 8597157043698818456} @@ -10002,7 +10002,7 @@ MonoBehaviour: - {fileID: 4343227825107918571} - {fileID: 6442799930695964210} - {fileID: 4208179434356543406} - FirearmsRenderers: [] + CrossbowRenderers: [] MakeupRenderer: {fileID: 4518295013249658832} MaskRenderer: {fileID: 1894255218323147008} EarringsRenderers: @@ -10034,6 +10034,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6dbda98e8614ec8a935809c1a0ace8a, type: 3} m_Name: m_EditorClassIdentifier: + SortingGroup: {fileID: 2642874521782211868} Sprites: - {fileID: 4208179434356543406} - {fileID: 3374391492828420216} @@ -10074,8 +10075,6 @@ MonoBehaviour: - {fileID: 6790471686932509478} - {fileID: 3908659237553944341} - {fileID: 6442799930695964210} - SortingGroup: {fileID: 2642874521782211868} - SortingOrderStep: 10 CopyTo: {fileID: 0} --- !u!114 &4726317439633481665 MonoBehaviour: @@ -12006,7 +12005,8 @@ MonoBehaviour: PrimaryWeapon: {fileID: 21300000, guid: 1fde2e89cec53e640997f2e11b658532, type: 3} SecondaryWeapon: {fileID: 0} Cape: {fileID: 0} - Back: {fileID: 0} + Quiver: {fileID: 0} + Backpack: {fileID: 0} Shield: [] Armor: - {fileID: 21300040, guid: 932eb8d5023602e45bd0f3d4e1206516, type: 3} @@ -12086,8 +12086,8 @@ MonoBehaviour: LeggingsRenderers: - {fileID: 3089589498850820000} - {fileID: 4240573199286117781} - CapeRenderer: {fileID: 0} - BackRenderer: {fileID: 0} + QuiverRenderer: {fileID: 0} + BackpackRenderer: {fileID: 0} ShieldRenderers: - {fileID: 6484598956806664084} BowRenderers: @@ -12096,7 +12096,7 @@ MonoBehaviour: - {fileID: 6919781975252132588} - {fileID: 4001757439886918657} - {fileID: 4540248313070711360} - FirearmsRenderers: [] + CrossbowRenderers: [] MakeupRenderer: {fileID: 1300368150109098810} MaskRenderer: {fileID: 1500454596874129539} EarringsRenderers: @@ -12128,6 +12128,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6dbda98e8614ec8a935809c1a0ace8a, type: 3} m_Name: m_EditorClassIdentifier: + SortingGroup: {fileID: 2642874521782211868} Sprites: - {fileID: 6909974970348155436} - {fileID: 3089589498850820000} @@ -12166,8 +12167,6 @@ MonoBehaviour: - {fileID: 5846372446835895647} - {fileID: 3808550755457449931} - {fileID: 1500454596874129539} - SortingGroup: {fileID: 2642874521782211868} - SortingOrderStep: 10 CopyTo: {fileID: 0} --- !u!114 &2326834231955293773 MonoBehaviour: diff --git a/Assets/MultiplayerPrefab/char1.prefab b/Assets/MultiplayerPrefab/char1.prefab index cddc0154..5bd3e422 100644 --- a/Assets/MultiplayerPrefab/char1.prefab +++ b/Assets/MultiplayerPrefab/char1.prefab @@ -4678,13 +4678,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 628237530585310953} + m_TargetAssemblyTypeName: invitePlayer, Assembly-CSharp + m_MethodName: AcceptInvite m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -6524,7 +6524,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 315.94073, y: -248.96912} + m_AnchoredPosition: {x: 417.36, y: -183.8} m_SizeDelta: {x: 200, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9007415412903153759 @@ -9849,6 +9849,7 @@ RectTransform: m_Children: - {fileID: 8752608139095817020} - {fileID: 3347673930407525693} + - {fileID: 4866742539517983073} - {fileID: 365828791895358502} - {fileID: 5989374854399517686} - {fileID: 7406951178957778888} @@ -13706,6 +13707,81 @@ MonoBehaviour: m_EditorClassIdentifier: SpriteName: Handle SpriteNameFallback: [] +--- !u!1 &2351473609533162076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7993113869792592536} + - component: {fileID: 3046765795872756398} + - component: {fileID: 6328057233196279398} + m_Layer: 6 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7993113869792592536 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351473609533162076} + 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: 4866742539517983073} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3046765795872756398 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351473609533162076} + m_CullTransparentMesh: 1 +--- !u!114 &6328057233196279398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351473609533162076} + 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.9137255} + 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: 21300000, guid: 2ce2c66aecb874b17b5a4fa5babe9209, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2363356881611647816 GameObject: m_ObjectHideFlags: 0 @@ -15263,6 +15339,7 @@ MonoBehaviour: syncDirection: 0 syncMode: 0 syncInterval: 0 + invitePlayer: {fileID: 628237530585310953} statManager: {fileID: 0} health: 100 character: {fileID: 6938941000042972233} @@ -15271,6 +15348,7 @@ MonoBehaviour: animIntNetwork: 0 enemyKillCount: 0 XP: 0 + myPartyOwner: playerName: playerCoin: 0 myCharJson: @@ -15456,8 +15534,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2cd6dbd4b563842d7b76048ec723877e, type: 3} m_Name: m_EditorClassIdentifier: + syncDirection: 0 + syncMode: 0 + syncInterval: 0 inviteUI: {fileID: 1189805396227737751} beingInviteUI: {fileID: 3403377910151212874} + inPartyUI: {fileID: 6212582780142130674} + inPartyOwnerNameTxt: {fileID: 4157618920817146930} + inPartyPlayersTxt: {fileID: 4763456039480402226} + inviteOwnerNameTxt: {fileID: 4157618920817146930} uiCanvasGroup: {fileID: 2096525255603639546} bUiCanvasGroup: {fileID: 6470811560482639934} uiRectTransform: {fileID: 3347673930407525693} @@ -15468,6 +15553,7 @@ MonoBehaviour: disappearEase: 26 offScreenPosition: {x: 1200, y: -140} onScreenPosition: {x: 1300, y: -140} + InviteOwner: --- !u!1 &2496517864824674819 GameObject: m_ObjectHideFlags: 0 @@ -16444,6 +16530,142 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2589541604276762930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6524006375869240929} + - component: {fileID: 7930851498117997810} + - component: {fileID: 1317145704578748413} + m_Layer: 6 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6524006375869240929 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2589541604276762930} + 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: 8025276278638308788} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000022888184, y: 0} + m_SizeDelta: {x: -20.1739, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7930851498117997810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2589541604276762930} + m_CullTransparentMesh: 1 +--- !u!114 &1317145704578748413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2589541604276762930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 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_text: 'Leave Party + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} + m_sharedMaterial: {fileID: 5416806443266638455, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16.95 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 20 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2590930984032790525 GameObject: m_ObjectHideFlags: 0 @@ -21135,8 +21357,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 628237530585310953} - m_TargetAssemblyTypeName: InviteUIManager, Assembly-CSharp - m_MethodName: HidePanel + m_TargetAssemblyTypeName: invitePlayer, Assembly-CSharp + m_MethodName: DeclineInvite m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -22191,6 +22413,139 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3316565204369754080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8025276278638308788} + - component: {fileID: 7851885531303711859} + - component: {fileID: 3836459353329199914} + - component: {fileID: 5065525374850570315} + m_Layer: 6 + m_Name: LeaveParty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8025276278638308788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3316565204369754080} + 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: 6524006375869240929} + m_Father: {fileID: 4866742539517983073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100.47, y: -282.2} + m_SizeDelta: {x: 120.1848, y: 35} + m_Pivot: {x: 0.4999993, y: 0.5000001} +--- !u!222 &7851885531303711859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3316565204369754080} + m_CullTransparentMesh: 1 +--- !u!114 &3836459353329199914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3316565204369754080} + 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.6320754, g: 0.02885828, b: 0, 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: 21300000, guid: 918331b18f6de40619bd8048ab8e4460, type: 3} + 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!114 &5065525374850570315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3316565204369754080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 3836459353329199914} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 628237530585310953} + m_TargetAssemblyTypeName: invitePlayer, Assembly-CSharp + m_MethodName: LeaveParty + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &3364566294147990816 GameObject: m_ObjectHideFlags: 0 @@ -26056,7 +26411,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 39.001953, y: 72.5} + m_AnchoredPosition: {x: 37.61, y: 129} m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1453265793191703743 @@ -29496,6 +29851,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4386572874839400755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3268208695809012095} + - component: {fileID: 50248178383363695} + - component: {fileID: 4763456039480402226} + m_Layer: 6 + m_Name: party list + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3268208695809012095 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4386572874839400755} + 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: 4866742539517983073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0000076293945, y: -16.85} + m_SizeDelta: {x: -19.6109, y: -46.449} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &50248178383363695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4386572874839400755} + m_CullTransparentMesh: 1 +--- !u!114 &4763456039480402226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4386572874839400755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 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_text: Party Info + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} + m_sharedMaterial: {fileID: 5416806443266638455, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4391053909025021614 GameObject: m_ObjectHideFlags: 0 @@ -30584,6 +31073,139 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &4646608836981664727 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8907363270874956250} + - component: {fileID: 4400329772404260347} + - component: {fileID: 2578887793353431738} + - component: {fileID: 7182116734245252213} + m_Layer: 6 + m_Name: CloseInvite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8907363270874956250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4646608836981664727} + 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: 5648778016147443728} + m_Father: {fileID: 4866742539517983073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 183.44, y: -282.2} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4400329772404260347 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4646608836981664727} + m_CullTransparentMesh: 1 +--- !u!114 &2578887793353431738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4646608836981664727} + 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: 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: 21300000, guid: c61a4711f5fe94b78adbc409a312cf88, type: 3} + m_Type: 0 + 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!114 &7182116734245252213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4646608836981664727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 2578887793353431738} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 628237530585310953} + m_TargetAssemblyTypeName: InviteUIManager, Assembly-CSharp + m_MethodName: CloseInviteUI + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &4652516578228751717 GameObject: m_ObjectHideFlags: 0 @@ -33219,6 +33841,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5146471289561715007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4336578234511064408} + - component: {fileID: 56584241812862302} + - component: {fileID: 4157618920817146930} + m_Layer: 6 + m_Name: party info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4336578234511064408 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5146471289561715007} + 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: 4866742539517983073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0000076293945, y: 120.8407} + m_SizeDelta: {x: -19.6109, y: -241.6813} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &56584241812862302 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5146471289561715007} + m_CullTransparentMesh: 1 +--- !u!114 &4157618920817146930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5146471289561715007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 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_text: Party Info + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} + m_sharedMaterial: {fileID: 5416806443266638455, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5172573186478483239 GameObject: m_ObjectHideFlags: 0 @@ -34699,13 +35455,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 628237530585310953} + m_TargetAssemblyTypeName: invitePlayer, Assembly-CSharp + m_MethodName: InvitePlayer m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -38455,6 +39211,144 @@ MonoBehaviour: m_EditorClassIdentifier: SpriteName: LeftHandR SpriteNameFallback: [] +--- !u!1 &6212582780142130674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4866742539517983073} + - component: {fileID: 1379533227337628346} + - component: {fileID: 5904870102553305148} + - component: {fileID: 1201475092618513662} + - component: {fileID: 7327421380419707942} + m_Layer: 6 + m_Name: PartyUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4866742539517983073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6212582780142130674} + 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: 7993113869792592536} + - {fileID: 4336578234511064408} + - {fileID: 3268208695809012095} + - {fileID: 8025276278638308788} + - {fileID: 8907363270874956250} + m_Father: {fileID: 2292226162926766732} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 115.58, y: -340.91} + m_SizeDelta: {x: 200.9414, y: 285.78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1379533227337628346 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6212582780142130674} + m_CullTransparentMesh: 1 +--- !u!114 &5904870102553305148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6212582780142130674} + 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: 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: 21300000, guid: f66f68563f67d4413a20b7b5a7322a10, type: 3} + 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!114 &1201475092618513662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6212582780142130674} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 0 + m_TargetGraphic: {fileID: 5904870102553305148} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!225 &7327421380419707942 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6212582780142130674} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &6213132552135755501 GameObject: m_ObjectHideFlags: 0 @@ -42206,7 +43100,7 @@ GameObject: - component: {fileID: 6137251443529331717} - component: {fileID: 7030286270905106535} m_Layer: 6 - m_Name: Text (TMP) + m_Name: invited by .. m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -42259,7 +43153,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: You are being invited to a Party by .... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} m_sharedMaterial: {fileID: 5416806443266638455, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} @@ -42286,7 +43180,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 + m_fontSize: 18 m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -56394,7 +57288,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Invite The player to your party ? + m_text: Invite this player to your party ? m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} m_sharedMaterial: {fileID: 5416806443266638455, guid: d70f485aa27dc43f79a8fd168f58435c, type: 2} @@ -56463,6 +57357,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8884561872263782890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5648778016147443728} + - component: {fileID: 4772669117551593626} + - component: {fileID: 8883146744340535310} + m_Layer: 6 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5648778016147443728 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884561872263782890} + 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: 8907363270874956250} + 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.1739, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4772669117551593626 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884561872263782890} + m_CullTransparentMesh: 1 +--- !u!114 &8883146744340535310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884561872263782890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c416dba26a5cc4682af5161d902cf565, type: 2} + m_sharedMaterial: {fileID: 3201670982812318815, guid: c416dba26a5cc4682af5161d902cf565, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8906924548754239854 GameObject: m_ObjectHideFlags: 0 @@ -59044,7 +60072,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 39, y: 145} + m_AnchoredPosition: {x: 39.001953, y: 182.43} m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6895624199580609165 diff --git a/Assets/ClickWorldObj.cs b/Assets/Script/ClickWorldObj.cs similarity index 100% rename from Assets/ClickWorldObj.cs rename to Assets/Script/ClickWorldObj.cs diff --git a/Assets/ClickWorldObj.cs.meta b/Assets/Script/ClickWorldObj.cs.meta similarity index 100% rename from Assets/ClickWorldObj.cs.meta rename to Assets/Script/ClickWorldObj.cs.meta diff --git a/Assets/CraftManager.cs b/Assets/Script/CraftManager.cs similarity index 100% rename from Assets/CraftManager.cs rename to Assets/Script/CraftManager.cs diff --git a/Assets/CraftManager.cs.meta b/Assets/Script/CraftManager.cs.meta similarity index 100% rename from Assets/CraftManager.cs.meta rename to Assets/Script/CraftManager.cs.meta diff --git a/Assets/CraftStation.cs b/Assets/Script/CraftStation.cs similarity index 100% rename from Assets/CraftStation.cs rename to Assets/Script/CraftStation.cs diff --git a/Assets/CraftStation.cs.meta b/Assets/Script/CraftStation.cs.meta similarity index 100% rename from Assets/CraftStation.cs.meta rename to Assets/Script/CraftStation.cs.meta diff --git a/Assets/Script/FarmingManager.cs b/Assets/Script/FarmingManager.cs index 192c2a2d..ec662974 100644 --- a/Assets/Script/FarmingManager.cs +++ b/Assets/Script/FarmingManager.cs @@ -46,6 +46,7 @@ public class FarmingManager : NetworkBehaviour } } + public void Spawn(int index){ FarmingPositionEntry item = farmingItems[index]; GameObject spawn = Instantiate(item.prefab , item.spawnLocation.position , Quaternion.identity); @@ -95,7 +96,6 @@ public class FarmingPositionEntry{ } - [System.Serializable] public class FarmingSpawnPoints{ public Transform pointsParent; diff --git a/Assets/InGameCharacterMgr.cs b/Assets/Script/InGameCharacterMgr.cs similarity index 100% rename from Assets/InGameCharacterMgr.cs rename to Assets/Script/InGameCharacterMgr.cs diff --git a/Assets/InGameCharacterMgr.cs.meta b/Assets/Script/InGameCharacterMgr.cs.meta similarity index 100% rename from Assets/InGameCharacterMgr.cs.meta rename to Assets/Script/InGameCharacterMgr.cs.meta diff --git a/Assets/LostNpc.cs b/Assets/Script/LostNpc.cs similarity index 100% rename from Assets/LostNpc.cs rename to Assets/Script/LostNpc.cs diff --git a/Assets/LostNpc.cs.meta b/Assets/Script/LostNpc.cs.meta similarity index 100% rename from Assets/LostNpc.cs.meta rename to Assets/Script/LostNpc.cs.meta diff --git a/Assets/autoDisableGameObj.cs b/Assets/Script/autoDisableGameObj.cs similarity index 100% rename from Assets/autoDisableGameObj.cs rename to Assets/Script/autoDisableGameObj.cs diff --git a/Assets/autoDisableGameObj.cs.meta b/Assets/Script/autoDisableGameObj.cs.meta similarity index 100% rename from Assets/autoDisableGameObj.cs.meta rename to Assets/Script/autoDisableGameObj.cs.meta diff --git a/Assets/Script/cameraRPG.cs b/Assets/Script/cameraRPG.cs index 0201f624..f9dd0d17 100644 --- a/Assets/Script/cameraRPG.cs +++ b/Assets/Script/cameraRPG.cs @@ -32,4 +32,6 @@ public class cameraRPG : MonoBehaviour public void Teleport(Vector3 newLocation){ transform.position = newLocation - offset; } + + } diff --git a/Assets/Script/invitePlayer.cs b/Assets/Script/invitePlayer.cs new file mode 100644 index 00000000..7237908c --- /dev/null +++ b/Assets/Script/invitePlayer.cs @@ -0,0 +1,151 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using DG.Tweening; +using Mirror; +using TMPro; + +public class invitePlayer : NetworkBehaviour +{ + [Header("UI References")] + [SerializeField] private GameObject inviteUI, beingInviteUI; + [SerializeField] private GameObject inPartyUI; + [SerializeField] private TMP_Text inPartyOwnerNameTxt; + [SerializeField] private TMP_Text inPartyPlayersTxt; + [SerializeField] private TMP_Text inviteOwnerNameTxt; + [SerializeField] private CanvasGroup uiCanvasGroup, bUiCanvasGroup; + [SerializeField] private RectTransform uiRectTransform, panelRect; + + + [Header("Animation Settings")] + [SerializeField] private float appearDuration = 0.3f; + [SerializeField] private float disappearDuration = 0.2f; + [SerializeField] private Ease appearEase = Ease.OutBack; + [SerializeField] private Ease disappearEase = Ease.InBack; + + [SerializeField] private Vector2 offScreenPosition = new Vector2(1200, -140); + [SerializeField] private Vector2 onScreenPosition = new Vector2(1300, -140); + private void Start() + { + + uiRectTransform.localScale = Vector3.zero; + uiCanvasGroup.alpha = 0; + + inviteUI.SetActive(false); + beingInviteUI.SetActive(false); + + onScreenPosition = panelRect.anchoredPosition; + + offScreenPosition = new Vector2( + +Screen.width, // Use screen width for consistent off-screen positioning + onScreenPosition.y + ); + + + panelRect.anchoredPosition = offScreenPosition; + } + + void Update() + { + if (Input.GetKeyDown(KeyCode.L)) + { + ShowInvite("keyBoard"); + } + } + private void OnMouseDown() //clicking on collider + { + ShowInviteUI(); + } + + public void ShowInviteUI() + { + inviteUI.SetActive(true); + + uiCanvasGroup.alpha = 0; + uiRectTransform.localScale = Vector3.zero; + + Sequence showSequence = DOTween.Sequence(); + showSequence.Append(uiRectTransform.DOScale(1, appearDuration).SetEase(appearEase)) + .Join(uiCanvasGroup.DOFade(1, appearDuration)) + .SetUpdate(true); + Camera.main.DOShakePosition(0.2f, 0.1f, 1, 90f, false); + + } + + public void CloseInviteUI() + { + + Sequence hideSequence = DOTween.Sequence(); + hideSequence.Append(uiRectTransform.DOScale(0, disappearDuration).SetEase(disappearEase)) + .Join(uiCanvasGroup.DOFade(0, disappearDuration)) + .OnComplete(() => inviteUI.SetActive(false)); + } + + public void InvitePlayer() + { + string thisPlayerName = GetComponent().playerName; + playerNetwork.localPlayer.CmdInvitePlayer(thisPlayerName); + HidePanel(); + } + + public string InviteOwner = ""; + + public void ShowInvite(string ownerName) + { + InviteOwner = ownerName; + inviteOwnerNameTxt.text = "You are being invited to a Party by " + ownerName; + Debug.Log("ShowPanel called"); + + beingInviteUI.SetActive(true); + + panelRect.DOAnchorPos(onScreenPosition, 0.5f) + .SetEase(Ease.OutBack); + } + + + public void AcceptInvite() + { + playerNetwork.localPlayer.CmdAcceptInvite(InviteOwner); + HidePanel(); + } + + public void DeclineInvite() + { + HidePanel(); + } + public void HidePanel() + { + panelRect.DOAnchorPos(offScreenPosition, 0.5f) + .SetEase(Ease.OutBack) + .OnComplete(() => beingInviteUI.SetActive(false)); + } + + public void InParty(string ownerName) + { + if (ownerName.Length == 0) + { + inPartyUI.SetActive(false); + } + else + { + inPartyUI.SetActive(true); + inPartyOwnerNameTxt.text = $"{ownerName}'s Party"; + + playerNetwork[] players = FindObjectsOfType(); + List playerNames = new List(); + foreach (playerNetwork player in players) + { + if (player.myPartyOwner == ownerName) + { + playerNames.Add(player.playerName); + } + } + inPartyPlayersTxt.text = string.Join(", ", playerNames); + } + } + + public void LeaveParty(){ + //playerNetwork.localPlayer.CmdLeaveParty(); + inPartyUI.SetActive(false); + } +} diff --git a/Assets/invitePlayer.cs.meta b/Assets/Script/invitePlayer.cs.meta similarity index 100% rename from Assets/invitePlayer.cs.meta rename to Assets/Script/invitePlayer.cs.meta diff --git a/Assets/Script/playerNetwork.cs b/Assets/Script/playerNetwork.cs index d1c4ad1e..cf35253c 100644 --- a/Assets/Script/playerNetwork.cs +++ b/Assets/Script/playerNetwork.cs @@ -19,6 +19,9 @@ using Newtonsoft.Json; public class playerNetwork : NetworkBehaviour { + public static playerNetwork localPlayer; + public invitePlayer invitePlayer; + public const float ATTACK_COOLDOWN = 0.6f; [HideInInspector] public StatManager statManager; @@ -44,6 +47,8 @@ public class playerNetwork : NetworkBehaviour [SyncVar(hook = nameof(OnXpChanged))] public int XP; + [SyncVar] + public string myPartyOwner; public int lvl2 { get{ return GetLevelForKills2(enemyKillCount); @@ -204,7 +209,10 @@ public class playerNetwork : NetworkBehaviour localPlayerTransform.GetComponent().questActions.Add(action); } - + void Awake(){ + invitePlayer = GetComponent(); + rangeEnemyFind = GetComponent(); + } void Start(){ // for(int i =0; i < 2000; i+=10){ @@ -221,6 +229,7 @@ public class playerNetwork : NetworkBehaviour }else{ localPlayerTransform = transform; + localPlayer = this; cameraRPG.instance.SetTarget(transform); #if UNITY_EDITOR ResetHealthAndArmor(); @@ -244,6 +253,43 @@ public class playerNetwork : NetworkBehaviour } + [Command] + public void CmdInvitePlayer(string otherPlayerName){ + if(myPartyOwner == null || myPartyOwner.Length == 0){ + FindPlayerByName(otherPlayerName).ShowInvite(playerName); + }else{ + FindPlayerByName(otherPlayerName).ShowInvite(myPartyOwner); + } + + } + + + public void ShowInvite(string ownerName){ + RpcInvitePlayer(ownerName); + } + + [ClientRpc] + void RpcInvitePlayer(string playerName){ + if(!isLocalPlayer){return;} + + invitePlayer.ShowInvite(playerName); + } + + [Command] + public void CmdAcceptInvite(string otherPlayerName){ + myPartyOwner = otherPlayerName; + } + + playerNetwork FindPlayerByName(string playerName){ + playerNetwork[] players = FindObjectsOfType(); + foreach(playerNetwork player in players){ + if(player.playerName == playerName){ + return player; + } + } + return null; + } + void LoadCharFromJson(string json){ if(json.Length <=0){return;} character.FromJson(json,true); @@ -372,9 +418,7 @@ public class playerNetwork : NetworkBehaviour rangeEnemyFinder rangeEnemyFind; enemyScript closestEnemy => rangeEnemyFind.targetEnemy; - void Awake(){ - rangeEnemyFind = GetComponent(); - } + float attackTimer = 0; [HideInInspector] @@ -395,6 +439,12 @@ public class playerNetwork : NetworkBehaviour txtEnemyKillCount.text = enemyKillCount.ToString(); coinText.text = playerCoin.ToString(); txtPlayerName.text = gplayAuth.userNameCloud; + + if(myPartyOwner != null && myPartyOwner.Length > 0){ + invitePlayer.InParty(myPartyOwner); + }else{ + invitePlayer.InParty(""); + } } ShowXP(); ShowLevel(); diff --git a/Assets/invitePlayer.cs b/Assets/invitePlayer.cs deleted file mode 100644 index 3f5a5ae5..00000000 --- a/Assets/invitePlayer.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using DG.Tweening; - -public class InviteUIManager : MonoBehaviour -{ - [Header("UI References")] - [SerializeField] private GameObject inviteUI , beingInviteUI; - [SerializeField] private CanvasGroup uiCanvasGroup , bUiCanvasGroup ; - [SerializeField] private RectTransform uiRectTransform , panelRect ; - - - [Header("Animation Settings")] - [SerializeField] private float appearDuration = 0.3f; - [SerializeField] private float disappearDuration = 0.2f; - [SerializeField] private Ease appearEase = Ease.OutBack; - [SerializeField] private Ease disappearEase = Ease.InBack; - - [SerializeField] private Vector2 offScreenPosition = new Vector2(1200 , -140); - [SerializeField] private Vector2 onScreenPosition = new Vector2(1300 , -140); - private void Start() - { - // Initialize hidden state - uiRectTransform.localScale = Vector3.zero; - uiCanvasGroup.alpha = 0; - - inviteUI.SetActive(false); - beingInviteUI.SetActive(false); - - onScreenPosition = panelRect.anchoredPosition; - - offScreenPosition = new Vector2( - +Screen.width, // Use screen width for consistent off-screen positioning - onScreenPosition.y - ); - - // Start with panel hidden - panelRect.anchoredPosition = offScreenPosition; - } - - void Update() - { - if (Input.GetKeyDown(KeyCode.L)) - { - ShowPanel(); - } - } - private void OnMouseDown() - { - ShowInviteUI(); - - } - - public void ShowInviteUI() - { - inviteUI.SetActive(true); - - // Reset values before animation - uiCanvasGroup.alpha = 0; - uiRectTransform.localScale = Vector3.zero; - - // Parallel animations - Sequence showSequence = DOTween.Sequence(); - showSequence.Append(uiRectTransform.DOScale(1, appearDuration).SetEase(appearEase)) - .Join(uiCanvasGroup.DOFade(1, appearDuration)) - .SetUpdate(true); // Ensures animation runs smoothly even if time scale is modified - // Add to ShowInviteUI() - Camera.main.DOShakePosition(0.2f, 0.1f, 1, 90f, false ); - // Ensures animation runs smoothly even if time scale is modified - } - - public void CloseInviteUI() - { - // Animate before disabling - Sequence hideSequence = DOTween.Sequence(); - hideSequence.Append(uiRectTransform.DOScale(0, disappearDuration).SetEase(disappearEase)) - .Join(uiCanvasGroup.DOFade(0, disappearDuration)) - .OnComplete(() => inviteUI.SetActive(false)); - } - - - public void ShowPanel() - { - Debug.Log("ShowPanel called"); - // Enable panel before animation - beingInviteUI.SetActive(true); - - panelRect.DOAnchorPos(onScreenPosition, 0.5f) - .SetEase(Ease.OutBack); - } - - public void HidePanel() - { - panelRect.DOAnchorPos(offScreenPosition, 0.5f) - .SetEase(Ease.OutBack) - .OnComplete(() => beingInviteUI.SetActive(false)); - } -} diff --git a/Packages/manifest.json b/Packages/manifest.json index 6b803bfe..25bdf93b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,48 +1,49 @@ -{ - "dependencies": { - "com.hwaet.projectcloner": "https://github.com/hwaet/UnityProjectCloner.git", - "com.unity.collab-proxy": "2.2.0", - "com.unity.feature.2d": "2.0.0", - "com.unity.ide.rider": "3.0.27", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.6", - "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.4", - "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9", - "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.9.1", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - } -} +{ + "dependencies": { + "com.boxqkrtm.ide.cursor": "https://github.com/boxqkrtm/com.unity.ide.cursor.git", + "com.hwaet.projectcloner": "https://github.com/hwaet/UnityProjectCloner.git", + "com.unity.collab-proxy": "2.2.0", + "com.unity.feature.2d": "2.0.0", + "com.unity.ide.rider": "3.0.27", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.7.6", + "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.4", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9", + "com.unity.ugui": "1.0.0", + "com.unity.visualscripting": "1.9.1", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index be830a1b..14d2ae57 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,14 @@ { "dependencies": { + "com.boxqkrtm.ide.cursor": { + "version": "https://github.com/boxqkrtm/com.unity.ide.cursor.git", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "hash": "38fecf55e4fd94ccfe58a92ed8ad1a529ba1694e" + }, "com.hwaet.projectcloner": { "version": "https://github.com/hwaet/UnityProjectCloner.git", "depth": 0,