Переглянути джерело

添加ItemAssociateConfig

lzx 6 днів тому
батько
коміт
5e35e63220

+ 74 - 0
Assets/Res/Config/ItemAssociateConfig.json

@@ -0,0 +1,74 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "associateID": 1,
+      "LanID": 10698
+    },
+    {
+      "ID": 2,
+      "associateID": 2,
+      "LanID": 10699
+    },
+    {
+      "ID": 3,
+      "associateID": 3,
+      "LanID": 10700
+    },
+    {
+      "ID": 4,
+      "associateID": 4,
+      "LanID": 10701
+    },
+    {
+      "ID": 5,
+      "associateID": 5,
+      "LanID": 10702
+    },
+    {
+      "ID": 6,
+      "associateID": 6,
+      "LanID": 10703
+    },
+    {
+      "ID": 7,
+      "associateID": 7,
+      "LanID": 10704
+    },
+    {
+      "ID": 8,
+      "associateID": 8,
+      "LanID": 10705
+    },
+    {
+      "ID": 9,
+      "associateID": 9,
+      "LanID": 10706
+    },
+    {
+      "ID": 10,
+      "associateID": 10,
+      "LanID": 10707
+    },
+    {
+      "ID": 11,
+      "associateID": 11,
+      "LanID": 10708
+    },
+    {
+      "ID": 12,
+      "associateID": 12,
+      "LanID": 10709
+    },
+    {
+      "ID": 13,
+      "associateID": 13,
+      "LanID": 10710
+    },
+    {
+      "ID": 14,
+      "associateID": 14,
+      "LanID": 10711
+    }
+  ]
+}

+ 7 - 0
Assets/Res/Config/ItemAssociateConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XSsa4CmpAHPCjhO7r4e7Y/eAbuusOH0/RoghHh3aZ0UOnYysnKJMs80slHTS
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 50 - 0
Assets/Scripts/GameData/ExcelConfig/ItemAssociateConfig.cs

@@ -0,0 +1,50 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\Item.xlsx. SheetName: ItemAssociateConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "ItemAssociateConfig.json")]
+	public partial class ItemAssociateConfigHolder : ConfigHolder<ItemAssociateConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct ItemAssociateConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///序列号
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ID;
+#else
+		public int ID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///特殊功能ID 
+		/// </summary>
+#if !COMBAT_SERVER
+		public int associateID;
+#else
+		public int associateID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///特殊用途描述 
+		/// </summary>
+#if !COMBAT_SERVER
+		public int LanID;
+#else
+		public int LanID{ set; get; }
+#endif
+		
+
+	}
+
+}
+// End of Auto Generated Code

+ 11 - 0
Assets/Scripts/GameData/ExcelConfig/ItemAssociateConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Dn1Ot3n7UnqCSGAyArxPsH9PoZ7zEKHgFq1fWvFv+eP+c8p02iTi5bQ7owI+
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 0
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs

@@ -141,6 +141,16 @@ namespace Fort23.Mono
         private void OnClick(ItemWidgetBasic obj)
         {
             DivineSenceItemWidget divineSenceItemWidget = obj as DivineSenceItemWidget;
+            
+            if (divineSenceItemWidget.ItemInfo.config.associateID == 6)
+            {
+                if (AccountFileInfo.Instance.playerData.divineSenseLevel <
+                    divineSenceItemWidget.ItemInfo.config.associateVlaue[2])
+                {
+                    return;
+                }
+            }
+          
             callBack?.Invoke(divineSenceItemWidget.ItemInfo.itemID);
             UIManager.Instance.HideUIUIPanel(this);
         }

+ 9 - 12
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -60,24 +60,21 @@ namespace Fort23.Mono
             itemDetailsWidget1.CustomInit("用途", LanguageManager.Instance.Text(itemInfo.config.itemDesc));
             itemDetailsWidgets.Add(itemDetailsWidget1);
 
-            //突破丹
-            if (itemInfo.config.associateID == 1)
-            {
-                ItemDetailsWidget itemDetailsWidge2 =
-                    await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
-                itemDetailsWidge2.CustomInit("服用效果",
-                    $"增加成功概率{itemInfo.config.associateVlaue[2]},突破失败降低修为损耗{itemInfo.config.associateVlaue[3]}%");
-                itemDetailsWidgets.Add(itemDetailsWidge2);
-            }
-            //修为丹
-            else if (itemInfo.config.associateID == 2)
+
+            ItemAssociateConfig itemAssociateConfig =
+                ConfigComponent.Instance.Get<ItemAssociateConfig>(itemInfo.config.associateID);
+
+            if (itemAssociateConfig.LanID != 0)
             {
                 ItemDetailsWidget itemDetailsWidge2 =
                     await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
-                itemDetailsWidge2.CustomInit("服用效果", $"增加修为值{itemInfo.config.associateVlaue[0]}");
+                itemDetailsWidge2.CustomInit("使用效果",
+                    UtilTools.GetString(LanguageManager.Instance.Text(itemAssociateConfig.LanID),
+                        itemInfo.config.associateVlaue));
                 itemDetailsWidgets.Add(itemDetailsWidge2);
             }
 
+
             if (PlayerManager.Instance.BagController.GetItemCount(itemInfo.itemID) > 0)
             {
                 ItemDetailsWidget itemDetailsWidget =

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/Item.xlsx


Деякі файли не було показано, через те що забагато файлів було змінено