lcn 4 ماه پیش
والد
کامیت
739382c9fd

+ 5 - 4
Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -260,10 +260,7 @@ namespace GameLogic.Equipment
                 {
                     eqList.Add(eqItem);    
                     eqItem.eqInfo.isEquip = true;
-                    if (!isInit)
-                    {
-                        AccountFileInfo.Instance.SaveItemData(eqItem);
-                    }
+
                 }
             }
             else
@@ -279,6 +276,10 @@ namespace GameLogic.Equipment
             if (isAdd)
             {
                 CalZyEqAddAttribute();
+                if (!isInit)
+                {
+                    AccountFileInfo.Instance.SaveItemData(eqItem);
+                }
             }
 
             return isAdd;

+ 1 - 1
Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -54,7 +54,7 @@ namespace GameLogic.Hero
 
         private void OnHeroPowerUp(IEventData e)
         {
-            HeroPowerUpEventData data = new HeroPowerUpEventData();
+            HeroPowerUpEventData data = e as HeroPowerUpEventData;
             if (data.upType == HeroUpType.BasicEquip)
             {
                 CalAttribute();

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 9 - 9
UserSettings/EditorUserSettings.asset

@@ -21,25 +21,25 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5604565200030f5d5d575c7a417b5a44404f1e292e7125672c7b1f63e7b96269
+      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0009555e5400515f590b097412770f1140161d2b7d2977642e2b4a63b1e5636d
+      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 0509560200060a0c5908552040750b44444f1a7a2a7827327c2a1e63b3b4603c
+      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 020600005157590b5e595b7313215b44424e4b7f7b2b70337479486be6b46d39
+      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5455050750515e025d5f5b2342770f4212164878792d2462282a4a62b1e5603d
+      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 0600055050050c595f0c097146200b44464f4c2f7c2c24627b2a4d35e6e4366c
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 0052555e0156080d0b0c097b4726594443154b287c7f76617b2b1830e1b5613b
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-7:
       value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
@@ -57,10 +57,10 @@ EditorUserSettings:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8d97ddbd90bf
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b982988db381b2b4808789f4aaa0a3b9adb9b3a8c482a7eec9b0a0f0a5aecee8c2c7d9b2d08e9c9189ea9e93de81e0dbc9dc94dfcd9b9f9a8188dff4c3fac0f7f4c2f9f7c7c5f0cdfdc5c6d0f079f1f531343226ecece8e6d3ebef3fd22229d7df276a9b64
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd81908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9195908797a7cf
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908ff0a2a4a1bbaaa0a9f2a3f3f8aa93e6edf38e9ccbddc18390ac86d4849394ea829f83f291cb918384d28397d5888b89dcf2dff2c7f7f7c2f3f38b88
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است