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

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -141,8 +141,6 @@ namespace VEngine.Editor.Builds
             //特效
             resPath = ResPathUtil.GetDressUpEffectDirPath(res);
             hideDirPahtList.Add(resPath);
-            resPath = ResPathUtil.GetDressUpEffectDirPath(res, true);
-            hideDirPahtList.Add(resPath);
         }
 
         private void HideSuitActionRes(SuitCfg suitCfg, List<string> hideFilePathList, List<string> hideDirPahtList)
@@ -183,8 +181,6 @@ namespace VEngine.Editor.Builds
                 //特效
                 resPath = ResPathUtil.GetDressUpEffectDirPath(suitCfg.aniRes);
                 hideDirPahtList.Add(resPath);
-                resPath = ResPathUtil.GetDressUpEffectDirPath(suitCfg.aniRes, true);
-                hideDirPahtList.Add(resPath);
             }
         }
 

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -192,9 +192,9 @@ namespace GFGGame
             TryRemoveObj(parentObj, BODY_SPRITE_NAME);
             if (!string.IsNullOrEmpty(actionRes))
             {
-                AddAnimationObj(actionRes, BODY_ANIMATION_NAME, parentObj, 0);
+                var addAniObj = AddAnimationObj(actionRes, BODY_ANIMATION_NAME, parentObj, 0);
                 //特效
-                TryAddEffectObj(actionRes, BODY_EFFECT_OBJ_NAME, parentObj, 0, false);
+                TryAddEffectObj(actionRes, BODY_EFFECT_OBJ_NAME, parentObj, 0, addAniObj != null);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -63,6 +63,11 @@
             }
         }
 
+        public static void Pay(int buyID, int count)
+        {
+
+        }
+
         public static void Logout()
         {
             switch (LauncherConfig.ChannelId)
@@ -96,5 +101,13 @@
                 return LauncherConfig.ChannelId == ChannelID.BiliBili;
             }
         }
+
+        public static bool IsHuaWei
+        {
+            get
+            {
+                return LauncherConfig.ChannelId == ChannelID.HUAWEI;
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -126,18 +126,18 @@ namespace GFGGame
             return VEngine.Versions.Contains(resPath);
         }
 
-        public static string GetDressUpEffectDirPath(string res, bool inAni = false)
+        public static string GetDressUpEffectDirPath(string res)
         {
-            if (inAni)
-            {
-                return $"{EFFECT_DIR_PATH}/DressUpAni/{res}";
-            }
             return $"{EFFECT_DIR_PATH}/DressUp/{res}";
         }
 
         public static string GetDressUpEffectPath(string res, bool inAniDir = false, string extName = "prefab")
         {
-            return $"{GetDressUpEffectDirPath(res, inAniDir)}/{res}.{extName}";
+            if(inAniDir)
+            {
+                return $"{GetDressUpEffectDirPath(res)}/{res}2.{extName}";
+            }
+            return $"{GetDressUpEffectDirPath(res)}/{res}.{extName}";
         }
         public static string GetViewEffectPath(string uiName, string resName, string extName = "prefab")
         {

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -24,7 +24,7 @@ namespace GFGGame
         //平台id
         public static int platformId = 1;
         //渠道id
-        public static int ChannelId = 1;
+        public static int ChannelId = 101;
         public static string logApiRootUrl;
         public static string logApiReportLauncherUrl;
         public static string apkVersion;
@@ -62,15 +62,6 @@ namespace GFGGame
 #endif
 
 
-#if QD_TAPTAP
-            ChannelId = 1;
-#elif QD_HYKB
-            ChannelId = 2;
-#elif QD_BILIBILI
-            ChannelId = 3;
-#else
-            ChannelId = 101;
-#endif
             if (cfgName == "cfg_local")
             {
                 cfgUrl = "http://10.108.64.189:81/platform/{cfgName}.json";

GameClient/Assets/Game/Launcher/Platform/ChannelID.cs

@@ -5,6 +5,41 @@
         public const int TapTap = 1;
         public const int HYKB = 2;
         public const int BiliBili = 3;
+        public const int HUAWEI = 4;
         public const int Test = 101;
+
+        public static int GetQuickChannelID(int gameChannelID)
+        {
+            switch(gameChannelID)
+            {
+                case HYKB:
+                    return QuickChannelID.HYKB;
+                case BiliBili:
+                    return QuickChannelID.BiliBili;
+                case HUAWEI:
+                    return QuickChannelID.HUAWEI;
+            }
+            return 0;
+        }
+
+        public static int GetGameChannelID(int quickChannelID)
+        {
+            switch (quickChannelID)
+            {
+                case QuickChannelID.HYKB:
+                    return HYKB;
+                case QuickChannelID.BiliBili:
+                    return BiliBili;
+                case QuickChannelID.HUAWEI:
+                    return HUAWEI;
+            }
+            return 0;
+        }
+    }
+    public class QuickChannelID
+    {
+        public const int HYKB = 2258;
+        public const int BiliBili = 114;
+        public const int HUAWEI = 24;
     }
 }