物品子类型

GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -267,15 +267,15 @@ namespace GFGEditor
                     }
                     else if (itemCfg.itemType == ConstItemType.PHOTOGRAPH)
                     {
-                        if (itemCfg.subType == ConstItemSubType.NPC)
+                        if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_NPC)
                         {
                             count = 1;//人物
                         }
-                        else if (itemCfg.subType == ConstItemSubType.BOREDR)
+                        else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_BOREDR)
                         {
                             count = 3;//npc
                         }
-                        else if (itemCfg.subType == ConstItemSubType.EFFECT)
+                        else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_EFFECT)
                         {
                             count = 4;//滤镜
                         }

GameClient/Assets/Game/HotUpdate/Constant/ConstItemSubType.cs

@@ -1,20 +0,0 @@
-
-namespace GFGGame
-{
-    public class ConstItemSubType
-    {
-        /// <summary>
-        /// npc
-        /// </summary>
-        public const int NPC = 1;
-        /// <summary>
-        /// 拍照边框
-        /// </summary>
-        public const int BOREDR = 2;
-        /// <summary>
-        /// 拍照滤镜
-        /// </summary>
-        public const int EFFECT = 3;
-
-    }
-}

GameClient/Assets/Game/HotUpdate/Constant/ConstItemSubType.cs.meta

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

GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs

@@ -54,16 +54,16 @@ namespace GFGGame
             }
             else if (itemCfg.itemType == ConstItemType.PHOTOGRAPH)
             {
-                if (itemCfg.subType == ConstItemSubType.NPC)
+                if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_NPC)
                 {
                     if (listNpcData.IndexOf(itemID) < 0) listNpcData.Add(itemID);
                 }
-                else if (itemCfg.subType == ConstItemSubType.BOREDR)
+                else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_BOREDR)
                 {
                     if (listBorderData.IndexOf(ConstItemID.BORDERID) < 0) listBorderData.Insert(0, ConstItemID.BORDERID);
                     if (listBorderData.IndexOf(itemID) < 0) listBorderData.Add(itemID);
                 }
-                else if (itemCfg.subType == ConstItemSubType.EFFECT)
+                else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_EFFECT)
                 {
                     if (listEffectData.IndexOf(ConstItemID.EFFECTID) < 0) listEffectData.Insert(0, ConstItemID.EFFECTID);
                     if (listEffectData.IndexOf(itemID) < 0) listEffectData.Add(itemID);