Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -1,51 +0,0 @@
-namespace GFGGame
-{
-    public class ConstDressUpItemType
-    {
-        //发型
-        public const int FA_XING = 1;
-        //连衣裙
-        public const int LIAN_YI_QUN = 2;
-        //内搭
-        public const int NEI_DA = 3;
-        //上衣
-        public const int SHANG_YI = 4;
-        //下装
-        public const int XIA_ZHUANG = 5;
-        //外套
-        public const int WAI_TAO = 6;
-        //袜子
-        public const int WA_ZI = 7;
-        //鞋子
-        public const int XIE_ZI = 8;
-        //头饰
-        public const int TOU_SHI = 9;
-        //耳饰
-        public const int ER_SHI = 10;
-        //颈饰
-        public const int JING_SHI = 11;
-        //腰饰
-        public const int YAO_SHI = 12;
-        //手饰
-        public const int SHOU_SHI = 13;
-        //手持物
-        public const int SHOU_CHI_WU = 14;
-        //妆容
-        public const int ZHUANG_RONG = 16;
-        //氛围
-        public const int FEN_WEI = 17;
-        //背景
-        public const int BEI_JING = 18;
-        //环境
-        public const int HUAN_JING = 19;
-        //套装
-        public const int TAO_ZHUANG = 20;
-        //前景
-        public const int QIAN_JING = 21;
-        //背饰
-        public const int BEI_SHI = 22;
-        //特殊
-        public const int TE_SHU = 30;
-        public const int MAX = 99;
-    }
-}

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

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