diff --git a/Assets/CRC/game.asset b/Assets/CRC/game.asset index 1f2ad924b7..62355f9b52 100644 --- a/Assets/CRC/game.asset +++ b/Assets/CRC/game.asset @@ -15,8 +15,8 @@ MonoBehaviour: files: - id: 1 fileName: files.unity3d - crc: 2915344122 - size: 43663 + crc: 3821832585 + size: 43679 - id: 2 fileName: lz4/icons.unity3d crc: 4199313358 @@ -11551,8 +11551,8 @@ MonoBehaviour: size: 1244 - id: 2885 fileName: lzma/luabytes.unity3d - crc: 2329718323 - size: 6060318 + crc: 2826677527 + size: 6060178 - id: 2886 fileName: lzma/resconfigs.unity3d crc: 3320919773 diff --git a/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs b/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs index 94f0c276ff..c6d2f8ab9d 100644 --- a/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs @@ -44,7 +44,7 @@ namespace JLLogic void Awake() { - MixCode.Command_Switch(23); + MixCode.Command_Switch(23); } void OnApplicationQuit() diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua index 214ece85cc..5a3a86fd09 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua @@ -302,12 +302,13 @@ local SetSortingOrder = function(uiConfig, panel, isStackPanel, ...) for i = 1, #this.stackList do if this.stackList[i] and this.stackList[i].isOpened then --FHF DEBUG - coroutine.start(function() - coroutine.wait(0.3) - this.stackList[i].gameObject:SetActive(false) - this.stackList[i]:CloseUI() - end) - + -- coroutine.start(function() + -- coroutine.wait(0.01) + -- this.stackList[i].gameObject:SetActive(false) + -- this.stackList[i]:CloseUI() + -- end) + this.stackList[i].gameObject:SetActive(false) + this.stackList[i]:CloseUI() --FHF end diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 82de21179c..eb3c2b8770 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -208,23 +208,23 @@ function this:SetItemData(_itemDatas) if this.isFristOpen then go.gameObject:SetActive(false) end - + + --FHF 将原有 同步 数据更新 修改为现有的异步方式, local _updater=coroutine.start(function() coroutine.wait(0.05*index) - + Log("BagPanel SingleItemDataShow..") - this.SingleItemDataShow(go, _itemDatas[index]) if _itemDatas[index].itemConfig.ItemType == ItemType.HunYin then table.insert(list,go) end end) - -- this.SingleItemDataShow(go, _itemDatas[index]) - --if _itemDatas[index].itemConfig.ItemType == ItemType.HunYin then - -- table.insert(list,go) - + -- this.SingleItemDataShow(go, _itemDatas[index]) + --if _itemDatas[index].itemConfig.ItemType == ItemType.HunYin then + -- table.insert(list,go) + --FHF end) --特效层级重设 for i=1,#list do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 0f58ae8617..87f58d63b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -242,15 +242,6 @@ function this:SetRoleList(_roleDatas) if this.isFirstOpen then go.gameObject:SetActive(false) end - - -- local _updater=coroutine.start(function() - - -- coroutine.wait(0.1*index) - - -- Log("RoleListPanel SingleHeroDataShow..") - -- this.SingleHeroDataShow(go, roleDatas[index]) - - -- end) -- this.SingleHeroDataShow(go, roleDatas[index]) --Log("RoleListPanel::SetRoleList_HeroDataShow____") end) @@ -266,6 +257,7 @@ function this:SetRoleList(_roleDatas) Timer.New(function () go.gameObject:SetActive(true) PlayUIAnim(go.gameObject) + --将原有同步的数据更新,修改为异步调用 this.SingleHeroDataShow(go, roleDatas[index]) end, 0.03*(index-1)):Start() end) diff --git a/Assets/ManagedResources/~Lua/View/BtView.lua b/Assets/ManagedResources/~Lua/View/BtView.lua index 38aed4f361..06558a1a94 100644 --- a/Assets/ManagedResources/~Lua/View/BtView.lua +++ b/Assets/ManagedResources/~Lua/View/BtView.lua @@ -116,8 +116,14 @@ end function this:BindEvent() for pt, data in pairs(self._BtnConfig) do Util.AddClick(data.node, function() - if self.panelType == pt then return end - self:OnBtnClick(pt) + -- FHF 优化 栈注入 + coroutine.start(function() + coroutine.wait(0.01) + if self.panelType == pt then return end + self:OnBtnClick(pt) + + end) + end) -- 绑定红点 if data.rpType then