@@ -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,}$";
@@ -1 +1 @@
-Subproject commit 7672b26a41f28101af7075414424d6c784acfba4
+Subproject commit e765ef347b09bf02ed7f24b9c49d3874adfb52bf
@@ -43,8 +43,6 @@ namespace GFGGame
}
if (GameGlobal.skipGuide)
- GMController.GetAllDressUpItem();
- GMController.GetAllCardItem();
ReqUpdateStoryProgress(10, 100, 100010, 10100);
RoleDataManager.lvl = 100;
@@ -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()
@@ -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";