社稷大典

Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua

@@ -95,14 +95,14 @@ end
 
 function UIManager.Adapter()
     local notchHeight = 0
-    --if AppConst.isSDK then
+    if AppConst.isSDK then
         notchHeight = NotchScreenUtil.Instance:GetNotchHeight()
        
         if notchHeight == -1 then
             --TODO: 这里再配置一套小众的手机的屏幕高度
             notchHeight = 0
         end
-    --end
+    end
     UIManager.Offset = {
         Top = notchHeight,
         Bottom = 0,

Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua

@@ -98,6 +98,7 @@ function this:InitComponent(gameObject)
     this.effects = {}
     for i = 1, 3 do
         this.effects[i] = Util.GetGameObject(this.gameObject,"bg/x1_UI_ciyuanyinqin/UI/UI" .. i)
+        this.effects[i]:SetActive(false)
     end
 end
 
@@ -364,7 +365,7 @@ function this:OpenEffect()
             this.effectTime = nil
             return
         end
-        this.effects[curItemIndex]:GetComponent("ParticleSystem"):Play()
+        --this.effects[curItemIndex]:GetComponent("ParticleSystem"):Play()
     end, 0.2, -1)
     this.effectTime:Start()
 end
@@ -387,7 +388,9 @@ function this:RequestDonate(numCount)
 
             PopupTipPanel.ShowTip(string.format(GetLanguageStrById(12413), itemData[curItemIndex].value * numCount))
             trigger = false
-            this.effects[curItemIndex]:GetComponent("ParticleSystem"):Play()
+            --this.effects[curItemIndex]:GetComponent("ParticleSystem"):Play()
+            this.effects[curItemIndex]:SetActive(false)
+            this.effects[curItemIndex]:SetActive(true)
             this:Refresh()
             CheckRedPointStatus(RedPointType.Celebration)
         end)

Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua

@@ -457,7 +457,7 @@ function this.GetHeroDatas(_msgHeroData, force, specialEffects,guildSkill)
     
     heroData.warWaySlot1Id = _msgHeroData.warWaySlot1 or 0
     heroData.warWaySlot2Id = _msgHeroData.warWaySlot2 or 0
-
+    heroData.warWaySlot3Id = _msgHeroData.warWaySlot3 or 0
     heroData.planList = {}            --< 作战方案
     for i = 1, #_msgHeroData.combatPlans do
         heroData.planList[i] = {planId = _msgHeroData.combatPlans[i].planId, position = _msgHeroData.combatPlans[i].position}   --< 后端的第三个参数confPlanId不用

Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua

@@ -3048,7 +3048,8 @@ function this:AbilityUpdateUI()
         local isOpen = curHeroData.star >= limit[i]
         if isOpen then -- isOpen
             local isOn = false
-            local warWaySlotId = curHeroData[string.format("warWaySlot%dId", i)]            
+            local warWaySlotId = curHeroData[string.format("warWaySlot%dId", i)]
+            LogRed("sssssssssssssssssssssssssssssssss"..warWaySlotId)     
             if warWaySlotId and warWaySlotId ~= 0 then
                 isOn = true
             end