فهرست منبع

登录资源目录调整

guodong 1 سال پیش
والد
کامیت
553325b46d

+ 1 - 1
GameClient/Assets/AssetBundleBuilderSetting.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: AssetBundleBuilderSetting
   m_EditorClassIdentifier: 
   BuildPipeline: 0
-  BuildMode: 3
+  BuildMode: 0
   BuildPackage: GameLogic
   CompressOption: 2
   OutputNameStyle: 1

+ 24 - 24
GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -27,30 +27,6 @@ MonoBehaviour:
       AssetTags: preload
       ActiveRuleName: EnableGroup
       Collectors:
-      - CollectPath: Assets/Game/CSShare/Sqlite/excelConfig.sqlite.bytes
-        CollectorGUID: ef20d70915914224195c8bc33e9f6c8e
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackRawFile
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/ResIn/Font
-        CollectorGUID: 1295ceb03b9528244a0d4164f9f414fe
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/ResIn/Dll
-        CollectorGUID: 245d660d0740f254aa5fbfc8ad44f173
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackTopDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
       - CollectPath: Assets/ResIn/UI
         CollectorGUID: aed08f1fe291a0745900a0b2b06269b0
         CollectorType: 0
@@ -169,3 +145,27 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
+      - CollectPath: Assets/Game/CSShare/Sqlite/excelConfig.sqlite.bytes
+        CollectorGUID: ef20d70915914224195c8bc33e9f6c8e
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackRawFile
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/ResIn/Font
+        CollectorGUID: 1295ceb03b9528244a0d4164f9f414fe
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/ResIn/Dll
+        CollectorGUID: 245d660d0740f254aa5fbfc8ad44f173
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackTopDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 

+ 5 - 0
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -8,6 +8,7 @@ namespace GFGGame
         public const string FONT_DIR_PATH = "Assets/ResIn/Font";
         public static readonly string UI_DIR_PATH = "Assets/ResIn/UI";
         public static readonly string PREFAB_DIR_PATH = "Assets/ResIn/Prefab";
+        public static readonly string LoginRes_DIR_PATH = "Assets/ResIn/LoginRes";
         public static readonly string TEXTURE_FIGHT_DIR_PATH = "Assets/ResIn/Fight";
         public static readonly string CONFIG_DIR_PATH = "Assets/Game/CSShare/Sqlite";
 
@@ -129,6 +130,10 @@ namespace GFGGame
         {
             return $"{PREFAB_DIR_PATH}/{res}.{extName}";
         }
+        public static string GetLoginResPath(string res, string extName = "prefab")
+        {
+            return $"{LoginRes_DIR_PATH}/{res}.{extName}";
+        }
         public static string GetDressUpAnimationDirPath(string res)
         {
             return $"{ANIMATION_DIR_PATH}/DressUp/{res}";

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -69,7 +69,7 @@ namespace GFGGame
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             if (_sceneObject == null)
             {
-                _sceneObject = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneLogin"));
+                _sceneObject = GFGAsset.Load<GameObject>(ResPathUtil.GetLoginResPath("LoginSkin1/SceneLogin"));
             }
             // SceneController.UpdateLoginScene(_sceneObject);
             ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();

+ 8 - 0
GameClient/Assets/ResIn/LoginRes/LoginSkin1.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5ebb4488b6b0b2c47993e4d3db52d2a6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
GameClient/Assets/ResIn/Prefab/SceneLogin.prefab → GameClient/Assets/ResIn/LoginRes/LoginSkin1/SceneLogin.prefab


+ 0 - 0
GameClient/Assets/ResIn/Prefab/SceneLogin.prefab.meta → GameClient/Assets/ResIn/LoginRes/LoginSkin1/SceneLogin.prefab.meta


+ 0 - 0
GameClient/Assets/ResIn/LoginRes/bg_02.png → GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png


+ 0 - 0
GameClient/Assets/ResIn/LoginRes/bg_02.png.meta → GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png.meta


+ 0 - 0
GameClient/Assets/ResIn/LoginRes/bg_t.png → GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png


+ 0 - 0
GameClient/Assets/ResIn/LoginRes/bg_t.png.meta → GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png.meta


+ 0 - 0
GameClient/Assets/ResIn/LoginRes/bg_top.png → GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png


+ 0 - 0
GameClient/Assets/ResIn/LoginRes/bg_top.png.meta → GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png.meta


+ 1 - 0
GameClient/Assets/Scenes/GameLauncher.unity

@@ -596,6 +596,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4b2b7d724105420439593585dd395c41, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  PlayMode: 2
 --- !u!1 &1597865575
 GameObject:
   m_ObjectHideFlags: 0