From 17d4c211b2fe0b02a26d2f6ca1ed812b49b79e66 Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 21 Jul 2024 21:52:51 +0530 Subject: [PATCH] inventoryFixedv2 --- .DS_Store | Bin 12292 -> 12292 bytes Assets/.DS_Store | Bin 12292 -> 12292 bytes .../Prefabs/Monster_13_Stone Golem.prefab | 2 +- .../Prefabs/Monster_14_Magma Golem.prefab | 2 +- .../Prefabs/Monster_19_Skeleton.prefab | 2 +- .../Prefabs/Monster_20_Skeleton King.prefab | 2 +- .../Prefabs/Monster_48_Flower.prefab | 2 +- .../Prefabs/Monster_49_Dark Flower.prefab | 2 +- .../Prefabs/Monster_58_Sword Block.prefab | 2 +- .../Prefabs/Monster_60_Tree Block.prefab | 2 +- .../Prefabs/Monster_66_Scythe Ghost.prefab | 2 +- .../Prefabs/Monster_67_Rune Ghost.prefab | 2 +- Assets/Lana Studio/Casual RPG VFX/.DS_Store | Bin 8196 -> 8196 bytes .../Upgrade for URP.unitypackage.meta | 7 + Assets/MultiplayerPrefab/.DS_Store | Bin 6148 -> 6148 bytes Assets/MultiplayerPrefab/Golem.prefab | 2 +- Assets/MultiplayerPrefab/char1.prefab | 876 ++++++++++++-- Assets/Plugins/.DS_Store | Bin 6148 -> 6148 bytes ...gle.firebase.firebase-app-unity-11.6.0.aar | Bin 3035294 -> 3035294 bytes ...le.firebase.firebase-auth-unity-11.6.0.aar | Bin 128328 -> 128328 bytes ...google.firebase.firebase-common-20.3.3.aar | Bin 76258 -> 76258 bytes ...rebase.firebase-firestore-unity-11.6.0.aar | Bin 202318 -> 202318 bytes Assets/Resources/.DS_Store | Bin 0 -> 6148 bytes Assets/Resources/Inventory/.DS_Store | Bin 0 -> 6148 bytes .../Inventory/items/BluePotion.asset | 3 +- Assets/Resources/Inventory/items/meat.asset | 3 +- Assets/Resources/Inventory/items/potion.asset | 3 +- Assets/Scenes/Game.unity | 1002 ++++++++--------- Assets/Scenes/MenuScene.unity | 49 +- Assets/Script/.DS_Store | Bin 0 -> 6148 bytes .../Inventory}/InventoryManager.cs | 23 +- .../Inventory}/InventoryManager.cs.meta | 0 Assets/Script/Inventory/ItemInventory.cs | 13 +- Assets/Script/playerNetwork.cs | 11 +- Assets/TextMesh Pro/.DS_Store | Bin 6148 -> 6148 bytes Assets/TextMesh Pro/Resources/.DS_Store | Bin 6148 -> 6148 bytes .../LiberationSans SDF - Fallback.asset | 286 +---- Packages/packages-lock.json | 35 +- ProjectSettings/GooglePlayGameSettings.txt | 7 + ProjectSettings/GvhProjectSettings.xml | 1 + ProjectSettings/ProjectSettings.asset | 16 +- ProjectSettings/ProjectVersion.txt | 4 +- 42 files changed, 1405 insertions(+), 956 deletions(-) create mode 100644 Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta create mode 100644 Assets/Resources/.DS_Store create mode 100644 Assets/Resources/Inventory/.DS_Store create mode 100644 Assets/Script/.DS_Store rename Assets/{ => Script/Inventory}/InventoryManager.cs (91%) rename Assets/{ => Script/Inventory}/InventoryManager.cs.meta (100%) diff --git a/.DS_Store b/.DS_Store index f6915c90111941674e869f869d8bccf5626a404e..653563f8562af2f81a3c2596be90e04b57912790 100644 GIT binary patch delta 404 zcmZokXi3;76@i!o*!&G`J|u>+lnBCU>>!}uLb2`OnxDGrUeR{4TNkMS-!vh@?dg-upGyY zV66{qYR4Rb9FfVZgt^!t0+V+M%d;?Z?P{2OSJ+9BBfKAI1q*`@Lq0<~Lve1ti%U{Y zeiBfOoVfXt`VDprR~rEU0aJ)Z delta 395 zcmZokXi3=QLopDhGL$eB7i1U)C+FuD0L2+n z+9zx-76@i!UhXA6`J|u>+nbI@UyIo$zZR5(G5Lk$nU;UpY#?OA$WkM=%W!gmupEb5 z(t-yrs>d9G9FfVZgt^!t0+V+M%d;>wM_!nGSJ+9BP3$Vr3Kj+*hJ1!}hT`0O7nh`* z{3M_l$F!f>-z-%pJBUcJL7536(oF0Hn`=dMnVBqROBqHNSJlb8rKMoZ z+tSiZh6^VDkiN&Hv}v-xjLhV_5ZGNGCh#l3vG60y*jMM-C diff --git a/Assets/.DS_Store b/Assets/.DS_Store index ec3a843aff6f888cbb5794042a459c6c3c14282c..35a858ff529adc1f53fc646c66af23ae5bd3b9d9 100644 GIT binary patch delta 286 zcmZokXi3;`M3`BrEO|1ch{oji!dz?yb?wD$YLov9n{do}>G|cU>M_U36NT0I3o;CY zlk;;67(hT}!{h>y=S*HtCr64ZvBllHJ^!Za*n|VZJmxrgqOcl&L55*)a(-?B z0|=-XOfC?4&LsAJa-^sdTaeMr>P;$>8%0$ROo@6F4U7sPZEOs|49N_s40%9YoRf|) zkTImt7+pR$-^C>3b`le3yf8UR>=RSu`pJIcGHgFX uL?-`Go?IX<2V+hVS70pIyj6T1Gqd|f%gI*KGLxI6bD6viHh+{B76AZFq*5*b diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_13_Stone Golem.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_13_Stone Golem.prefab index 92e8a151..3fb72cb1 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_13_Stone Golem.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_13_Stone Golem.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2613116b8a9839f4eb8abb181b83477e, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_14_Magma Golem.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_14_Magma Golem.prefab index 7b5a56c1..c6b2dda7 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_14_Magma Golem.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_14_Magma Golem.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad5de8193a625af48b1318e417ae6c7e, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_19_Skeleton.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_19_Skeleton.prefab index 51dae4b6..d726e603 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_19_Skeleton.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_19_Skeleton.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5c1e5d25177fa1740921151b338e4d3b, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_20_Skeleton King.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_20_Skeleton King.prefab index 28725121..7ade41d3 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_20_Skeleton King.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_20_Skeleton King.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9636898e0cabdf64d99f5040090fe41e, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_48_Flower.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_48_Flower.prefab index 73dd8a18..66de2476 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_48_Flower.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_48_Flower.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: cf8ec3e416933f743be4df134d5e44b1, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_49_Dark Flower.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_49_Dark Flower.prefab index 1629714f..5e18d2ee 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_49_Dark Flower.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_49_Dark Flower.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 645f88d72b3eef14ea19d492a14cf019, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_58_Sword Block.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_58_Sword Block.prefab index b81d11f9..45bd9292 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_58_Sword Block.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_58_Sword Block.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 8e74db0c7188ac54caf60d60c6f47ad8, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_60_Tree Block.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_60_Tree Block.prefab index 5e4f9edc..d54f77fb 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_60_Tree Block.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_60_Tree Block.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f6a02f93ff106dc4182282e95c48a7b6, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_66_Scythe Ghost.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_66_Scythe Ghost.prefab index f7dce126..726d095a 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_66_Scythe Ghost.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_66_Scythe Ghost.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1b30e6bfb9cebd5418e40f107af416af, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_67_Rune Ghost.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_67_Rune Ghost.prefab index 4214db6e..e1c3d906 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_67_Rune Ghost.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_67_Rune Ghost.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 29a955f37eb0e3549a9a2dfdc8ebcff6, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Lana Studio/Casual RPG VFX/.DS_Store b/Assets/Lana Studio/Casual RPG VFX/.DS_Store index 09dba82dfc53165bed231d978d22fea4f1a370c2..12892cd98c7f786ad9d54bbaa61502486182753e 100644 GIT binary patch delta 36 mcmZp1XmQwZM3{Zf`nU1-RgX<(6j7f1PM8PA-^?h&%mV-_-wz@H delta 36 mcmZp1XmQwZM3{X_|MX!0Lq{hwiYQNhC(HxmZ)Ox><^cc~c@8E3 diff --git a/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta new file mode 100644 index 00000000..1d182472 --- /dev/null +++ b/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5b07afdbcf13e43438545d591cfd2e4b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MultiplayerPrefab/.DS_Store b/Assets/MultiplayerPrefab/.DS_Store index 377b7ba52a06bbe32ab8b4acef02c875c3e9243b..9f0738fa405fa702a7564b4b08450065926cb7b0 100644 GIT binary patch delta 35 rcmZoMXffEZgN@03^JF=8xyd)!c-Up8MQhwwJvLdEU4Anc`!4|i+9eCn delta 27 jcmZoMXffEZgN?~ed9ob4+~gZ&A?U*A20|PsQBSRiT3PTY?K0_u$N^X9NOHxjL5>SQ%qH1#m HQ;#SBkh~4C delta 57 zcmZoMXffE}!=&><&16C`+c8H51_pKpM}|Cx6ow*(e1=Shl-&Fjm!zEhB%lljMAhaB HrXEoM&$18k diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.6.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.6.0.aar index 1932b996eec4ddce442ccfd4f206785c13a1230e..27cf7d3954cab7e87261c15892ec51c4a4f49765 100644 GIT binary patch delta 167 zcmWm8H;O_5002?GV|LA9%{hl(E`nDOJjC9_VvZr$SX(I`%u-N`fmhDy{0L5;uCEAx zm*)`)BqAR~B_?r6NK#UgmW=#JR&tV;f)u4BWvNJ2YVs>}X-HFA(w2^Nr6+wE$WTTy cmWfPdCUaTHQdY8-&5dxo{~q0Uhwwjm1N@LFEdT%j delta 167 zcmWm8w+TW4002?GXU;k2oNK`q1cz`FiyK3511rVWNnAuwi-T9*<@yXRziyup@8|1` z1QL=T!V;0F#3U{WNlHr6l98z>% diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-11.6.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-11.6.0.aar index 6c5acc9db103f4e0c7a10a54bd6e55c07b3718c7..2564801142e2ff1994ed0c094ea010be3477b859 100644 GIT binary patch delta 32 mcmX@{iv7eZ_6-Is%;w9!HXE~SH)dhn{T{^G{_!(oI3ob=u?|Q8 delta 32 mcmX@{iv7eZ_6-Is%nx=RYBpxsZp^~C`#p%W{o`lGa7Fnt&O0>Wmg(Mx{EV1DLT#ozV@%*v_iKc$X0X2AwTH delta 118 zcmaEKndQ-CmJL%GnIG;vw0Q<2A2WzCc_oVqn7+WG0j7Vm7=UR#Rx=RYoX)yEos}_0 r5yY8(OpVbF%wSh%Gyya0)EOPG1GPt7UpXLAi?c#MVJ#A0Ug*4F8}}l delta 40 tcmX@NhUeTGo(+O5%nx@SY8GK>7hz!pVy5jPEX>ygK!V%fiZCZK0su2z4nY6_ diff --git a/Assets/Resources/.DS_Store b/Assets/Resources/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..024dc47fe577386b2e66e902c9dfda8c76f6d3d4 GIT binary patch literal 6148 zcmeHKu}%Xq47H)dA(oCEvmh0TrGF5rW9Ujp7F3F0XnPd`q;63^q@TlY@Cz*LJjdq5 ziF88A;mmTTSe*=0Fu+0^xH(ahkjhMVo_>&eUczQ}nS`M$dv?vGsG ze_i=aH{jYCa0Z+KXTTZwIR2| dPW1<|5f=@UqRb-WIUVQ^flP=iXW$nY_yD0tG4KEY literal 0 HcmV?d00001 diff --git a/Assets/Resources/Inventory/.DS_Store b/Assets/Resources/Inventory/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a1e194d04bdc61822a5317348175e5d7947d12c9 GIT binary patch literal 6148 zcmeH~OG*Pl5QeKX!hj32blDqMqL>q;4dV&2b0smNLWT)M_k9x4Yj^-}B3{G49tJ0w zbr7k7?!O;ZJu@FncNY=yatly!~O;(j!}ZJTA!GJkVO z-u-|c>51;Bp^f)H`s~g&ZC%e6?F^&U_1XEw*U87_rpJ8kar*xDGT!o7KKv&1itw-? z5Cnoi5C{T0C4e(qtU5G}ItT=TAh0GN`$Iwz&922%w+>XA0zl;&t%kPb5)zYKvuiQM z42&%lYN6~Y23t7Bllx`YVrt>Uo_w%B`6qc{eLB`p>Q0gD1D%!tKzT;1K$luVVv=Ka zEQYW^*g}C8%3flyg=0RsUv?~p7EbKN2m8wJ#S81|$e+}mI2%SE37e_ zzf85r?}x-F7zhUb83R0Mr|kqE<#+3+&y%}0p`D|Nh+h!}0=@SLz(CHCLp7Q`i4MQ) WSPUhL%xgF>9s){8biu$cFz^Nljxw_V literal 0 HcmV?d00001 diff --git a/Assets/InventoryManager.cs b/Assets/Script/Inventory/InventoryManager.cs similarity index 91% rename from Assets/InventoryManager.cs rename to Assets/Script/Inventory/InventoryManager.cs index 1c54173f..cf4a72a4 100644 --- a/Assets/InventoryManager.cs +++ b/Assets/Script/Inventory/InventoryManager.cs @@ -77,12 +77,22 @@ public class InventoryManager : MonoBehaviour } pnet.SetHealth(pnet.health+i.healthIncrease); + pnet.SavePlayerData(); + return true; } + public item selectedItem; + + public void SelectItem(item itemI){ + selectedItem = itemI; + } + public void DropItem(item i) { pnet.DropPickup(i.type); + pnet.SavePlayerData(); + } public void AddInvItem(string type) @@ -120,5 +130,16 @@ public class InventoryManager : MonoBehaviour ItemInventory inventoryItemm = newItemAdd.GetComponent(); inventoryItemm.Set(item,this); + pnet.SavePlayerData(); + } -} \ No newline at end of file + + +} + + +[System.Serializable] +public class InventoryEntry{ + public int slot; + public string item; +} \ No newline at end of file diff --git a/Assets/InventoryManager.cs.meta b/Assets/Script/Inventory/InventoryManager.cs.meta similarity index 100% rename from Assets/InventoryManager.cs.meta rename to Assets/Script/Inventory/InventoryManager.cs.meta diff --git a/Assets/Script/Inventory/ItemInventory.cs b/Assets/Script/Inventory/ItemInventory.cs index 2e24b694..0323c491 100644 --- a/Assets/Script/Inventory/ItemInventory.cs +++ b/Assets/Script/Inventory/ItemInventory.cs @@ -26,16 +26,17 @@ public class ItemInventory : MonoBehaviour, IBeginDragHandler, IDragHandler, IEn public void Clear() { - UnityEditor.EditorApplication.delayCall += () => - { - DestroyImmediate(gameObject); - }; + + // UnityEditor.EditorApplication.delayCall += () => + // { + // DestroyImmediate(gameObject); + // }; } public void Drop() { inventoryManager. - DropItem(item); + DropItem(item); Destroy(gameObject); } @@ -66,6 +67,8 @@ public class ItemInventory : MonoBehaviour, IBeginDragHandler, IDragHandler, IEn public void OnPointerClick(PointerEventData eventData) { + //inventoryManager.SelectItem(item); + if (inventoryManager.UseItem(item)) { Destroy(gameObject); diff --git a/Assets/Script/playerNetwork.cs b/Assets/Script/playerNetwork.cs index 28075e99..0c9128cc 100755 --- a/Assets/Script/playerNetwork.cs +++ b/Assets/Script/playerNetwork.cs @@ -13,6 +13,7 @@ using GooglePlayGames; using UnityEngine.SocialPlatforms; using Firebase.Auth; using UnityEngine.UI; +using Newtonsoft.Json; public class playerNetwork : NetworkBehaviour { @@ -222,8 +223,10 @@ public class playerNetwork : NetworkBehaviour #if UNITY_EDITOR return; #endif + Debug.Log("*** Save Method Got Called ! ***"); if(!isLoaded){ + Debug.Log("*** Save Method Return ***"); return; } FirebaseFirestore db = FirebaseFirestore.DefaultInstance; @@ -231,7 +234,7 @@ public class playerNetwork : NetworkBehaviour //int playerCoin = int.Parse(coins.text); Dictionary saveValues = new Dictionary{ - {"playerInventory" , inventory.inventoryManager.GetEntries()}, + {"playerInventory" , JsonConvert.SerializeObject(inventory.inventoryManager.GetEntries())}, {"playerHealth" , health}, {"playerCoin", playerCoin}, {"killCount", enemyKillCount}, @@ -288,8 +291,8 @@ public class playerNetwork : NetworkBehaviour healthBar.value =(savedHealth); armorBar.value = savedHealth; //load Inventory - Dictionary inventoryGetData = snapshot.GetValue>("playerInventory"); - inventory.inventoryManager.SetInventory(inventoryGetData); + Dictionary inventoryGetData = JsonConvert.DeserializeObject>(snapshot.GetValue("playerInventory")); + inventory.inventoryManager.SetInventory(inventoryGetData); completedQuests = snapshot.GetValue>("completedQuest"); @@ -299,6 +302,8 @@ public class playerNetwork : NetworkBehaviour }else{ //show error previous data doesnt exists to load Debug.Log("**** No previous data to load ****"); + isLoaded = true; + } }); } diff --git a/Assets/TextMesh Pro/.DS_Store b/Assets/TextMesh Pro/.DS_Store index 7cbad42882cce605300c7a3998d35ea4f8b8ca5b..c24d06a40fa0b0d318fb8033657f8e9fca7807e9 100644 GIT binary patch delta 27 icmZoMXffE3&&sSLATW6jtHk6k)_5k}fX%O2C4~TTln3?z delta 27 icmZoMXffE3&&q6~>^^x8tHk6k)_5k + \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 582e1a65..92070b7e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -75,6 +76,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 0 @@ -86,6 +88,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -125,6 +128,7 @@ PlayerSettings: switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -133,7 +137,9 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 3.6 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 + bundleVersion: 3.7 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -145,6 +151,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -162,7 +169,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 12 + AndroidBundleVersionCode: 13 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 1 @@ -227,6 +234,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -550,7 +558,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -680,7 +688,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 @@ -846,6 +853,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 78a77889..31459c03 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.7f1 -m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0) +m_EditorVersion: 2022.3.33f1 +m_EditorVersionWithRevision: 2022.3.33f1 (b2c853adf198)