diff --git a/Assets/ManagedResources/Icons/live2d_npc_boy_t1.png b/Assets/ManagedResources/Icons/live2d_npc_boy_t1.png index d32e2ab1ed..130673f103 100644 Binary files a/Assets/ManagedResources/Icons/live2d_npc_boy_t1.png and b/Assets/ManagedResources/Icons/live2d_npc_boy_t1.png differ diff --git a/Assets/ManagedResources/Icons/live2d_npc_boy_t1.png.meta b/Assets/ManagedResources/Icons/live2d_npc_boy_t1.png.meta index 0c01187ab9..ad22244c56 100644 --- a/Assets/ManagedResources/Icons/live2d_npc_boy_t1.png.meta +++ b/Assets/ManagedResources/Icons/live2d_npc_boy_t1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4726837b60dcd9a448ad04650cf252a7 +guid: 8b068ad721dc1e34b9be8857b80953d2 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 7f4e0af4920924b4da339429befb82af + spriteID: e6dffff30d87d144ea19bf235f1c5aea vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Icons/live2d_npc_girl_t1.png b/Assets/ManagedResources/Icons/live2d_npc_girl_t1.png index 3e1195005b..40d85beba5 100644 Binary files a/Assets/ManagedResources/Icons/live2d_npc_girl_t1.png and b/Assets/ManagedResources/Icons/live2d_npc_girl_t1.png differ diff --git a/Assets/ManagedResources/Icons/live2d_npc_girl_t1.png.meta b/Assets/ManagedResources/Icons/live2d_npc_girl_t1.png.meta index f32d766675..b987451ede 100644 --- a/Assets/ManagedResources/Icons/live2d_npc_girl_t1.png.meta +++ b/Assets/ManagedResources/Icons/live2d_npc_girl_t1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6facd4399763e4e44b3a3306d3b9ba5c +guid: 592452cc306afed43983041fbf11a5bd TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 12db31d7cf1c04a48b720e5e3d31b367 + spriteID: 40f7c97c2d8659f4b8e29e856fe70736 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index 699662c273..9013b83c8e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -1052920,7 +1052920,6 @@ RectTransform: - {fileID: 4009969910180926143} - {fileID: 2423823732879755494} - {fileID: 1266753377350954170} - - {fileID: 9083458759989355217} m_Father: {fileID: 6069944947855371843} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1209431,6 +1209430,7 @@ RectTransform: - {fileID: 7307677066323945065} - {fileID: 1269122796582953627} - {fileID: 2646658914648676318} + - {fileID: 9083458759989355217} m_Father: {fileID: 7500976783325591551} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1690667,7 +1690667,7 @@ RectTransform: m_GameObject: {fileID: 5517072452696844133} 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_LocalScale: {x: 1.0001601, y: 1.0001601, z: 1.0001601} m_Children: - {fileID: 9027100629540498607} - {fileID: 4040587562430879254} @@ -1690678,12 +1690678,12 @@ RectTransform: - {fileID: 5493523172488818819} - {fileID: 2044914119881651690} - {fileID: 5353431509695904321} - m_Father: {fileID: 7500976783325591551} - m_RootOrder: 9 + m_Father: {fileID: 1266753377350954170} + m_RootOrder: 8 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: 147} + m_AnchoredPosition: {x: 0, y: 147.02353} m_SizeDelta: {x: 1010, y: 915.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8748947189617474778 diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 4b18ba9bbc..f8053e68c1 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -518,7 +518,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 132.07, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &178581007159197874 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua index 194161e268..e32d528fc0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua @@ -28,6 +28,7 @@ local index=0 --初始化组件(用于子类重写) function ExpeditionMonsterInfoPopup:InitComponent() + this.spLoader = SpriteLoader.New() this.contents=Util.GetGameObject(this.gameObject,"Contents") this.BGImage1=Util.GetGameObject(this.gameObject,"Contents/BG/BGImage1") this.BGImage2=Util.GetGameObject(this.gameObject,"Contents/BG/BGImage2") @@ -36,7 +37,7 @@ function ExpeditionMonsterInfoPopup:InitComponent() --子模块脚本初始化 for i = 1, #contentScripts do contentScripts[i].view:InitComponent(Util.GetGameObject(this.contents, contentScripts[i].panelName)) - this.spLoader = SpriteLoader.New() + end --预设赋值 for i=1,#contentScripts do