Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

GameClient/Assets/BuildSetting.asset

@@ -15,5 +15,6 @@ MonoBehaviour:
   dirBundleList:
   - Assets/Res/Animation/Card
   - Assets/Res/Animation/DressUp
-  - Assets/Res/Effect
+  - Assets/Res/Effect/DressUp
+  - Assets/Res/Effect/UI
   - Assets/ResIn/UI

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -9,8 +9,8 @@ namespace GFGEditor
 {
     public class ImportArtResTool
     {
-        //public static string ResRootDirName = "正式资源";
-        public static string ResRootDirName = "正式资源-demo1";
+        public static string ResRootDirName = "正式资源";
+        //public static string ResRootDirName = "正式资源-demo1";
         public static string ResRootPath { get { return $"../../../gfg/{ResRootDirName}/"; } }
 
         public static string ragule = @"^[0-9a-zA-Z_]{1,}$";

GameClient/Assets/Game/HotUpdate/Net/Proxy/GameProxy.cs

@@ -43,8 +43,6 @@ namespace GFGGame
                     }
                     if (GameGlobal.skipGuide)
                     {
-                        GMController.GetAllDressUpItem();
-                        GMController.GetAllCardItem();
                         ReqUpdateStoryProgress(10, 100, 100010, 10100);
                         RoleDataManager.lvl = 100;
                     }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryController.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             List<ItemData> bonusList = null;
             bool _fistPassLastLvl = false;
             bool _curLvfirstPass = false;
-            if (!isSkip)
+            if (!StoryDataManager.CheckCurrentLevelPass())
             {
 
                 bonusList = StoryDataManager.PassCurrentLevel(out _fistPassLastLvl, out _curLvfirstPass);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -97,6 +97,10 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
+            if(LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+            {
+                skipable = true;
+            }
             _ui.m_btnSkip.enabled = skipable;
             ShowNextStep(stroyStartID);
         }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -127,6 +127,7 @@ namespace GFGGame
         {
             base.OnHide();
             GuideController.TryCompleteGuide(ConstGuideId.CHAPTER_RESULT_VIEW);
+            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT_GUIDE);
             Timers.inst.Remove(AddExp);
             if (_sceneObject != null)
             {

GameClient/Assets/Game/HotUpdate/Views/MainUI/RoleInfoView.cs

@@ -1,4 +1,5 @@
 using UI.Main;
+using static GFGGame.LauncherConfig;
 
 namespace GFGGame
 {
@@ -31,6 +32,10 @@ namespace GFGGame
             _ui.m_btnSound.onClick.Add(OnClickBtnSound);
             _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
             _ui.m_btnHelp.onClick.Add(OnClickBtnHelp);
+            if(LauncherConfig.netType != EnumNetType.LOCAL)
+            {
+                _ui.m_btnHelp.visible = false;
+            }
         }
 
         protected override void OnShown()

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -23,11 +23,14 @@ namespace GFGGame
 
         public static void Init()
         {
-            netType = EnumNetType.LOCAL;
-            string cfgName = "cfg_local";
+            Debug.Log($"identifier: {Application.identifier}");
 #if PT_DEV
             //ÍâÍødev°æ±¾
+            netType = EnumNetType.DEV;
             cfgName = "cfg_dev";
+#else
+            netType = EnumNetType.LOCAL;
+            string cfgName = "cfg_local";
 #endif
 
             string url = $"http://39.99.144.134/res_dev/platform/{cfgName}.json";