diff --git a/Assets/GameRes/UIPrefabs/Login/LoginPanel.prefab b/Assets/GameRes/UIPrefabs/Login/LoginPanel.prefab index 84441a3acfc42d172a1f2b6d5aeaf0e3abc33886..eef41f0e32939da3cbbc37cb00d02696528cd7ba 100644 --- a/Assets/GameRes/UIPrefabs/Login/LoginPanel.prefab +++ b/Assets/GameRes/UIPrefabs/Login/LoginPanel.prefab @@ -1870,6 +1870,81 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &6569529159534405866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4113119798938260497} + - component: {fileID: 3478275598723888864} + - component: {fileID: 7509089638952109046} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4113119798938260497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6569529159534405866} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8156526501221630152} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3478275598723888864 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6569529159534405866} + m_CullTransparentMesh: 1 +--- !u!114 &7509089638952109046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6569529159534405866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6918157007815233559 GameObject: m_ObjectHideFlags: 0 @@ -2372,6 +2447,7 @@ RectTransform: - {fileID: 9202289682548026999} - {fileID: 3917598517821617153} - {fileID: 5272273222015305815} + - {fileID: 4113119798938260497} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Framework/Resource/AssetBundleMgr.cs b/Assets/Scripts/Framework/Resource/AssetBundleMgr.cs index 9115b5ad5083f2ddbbc4c014e5d887b10a843eda..410aa566a06c291953678db11a21a03f4490a709 100644 --- a/Assets/Scripts/Framework/Resource/AssetBundleMgr.cs +++ b/Assets/Scripts/Framework/Resource/AssetBundleMgr.cs @@ -49,9 +49,7 @@ public class AssetBundleMgr } if (null != ab) { - var assetName = fname.Substring(0, fname.IndexOf(".")); - obj = ab.LoadAsset(assetName); - GameLogger.LogGreen("Load Asset From AssetBundle: assetName: " + assetName); + obj = ab.LoadAsset("Assets/GameRes/" + uri); } #endif diff --git a/Assets/luabundle.meta b/Assets/luabundle.meta new file mode 100644 index 0000000000000000000000000000000000000000..4ba19f1f9b6d0f4819f1facfd1c88aa54a0414a0 --- /dev/null +++ b/Assets/luabundle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 659d8d4d3b8b1694b851a28a79baae38 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/updateZip.meta b/Assets/updateZip.meta new file mode 100644 index 0000000000000000000000000000000000000000..ff8a850aafa96d14ac3f9ef75c7041a8eb4e0871 --- /dev/null +++ b/Assets/updateZip.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb289fa176a70814d87d908cda424a2c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: