Merge branch 'master' into dev_20230809

# Conflicts:
#	lua/app/config/grid_type.lua
#	lua/app/userdata/dungeon/dungeon_armor_entity.lua

lua/app/module/battle/controller/battle_base_controller.lua

@@ -2338,7 +2338,7 @@ function BattleBaseController:shuffleBoard(callback)
     else
         self.resetList = table.clearOrCreate(self.resetList)
         for posId, entity in pairs(self.battleData:getGridEnties()) do
-            if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() then
+            if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() and not entity:getCantUpset() then
                 table.insert(self.resetList, entity)
             end
         end
@@ -2387,7 +2387,7 @@ function BattleBaseController:getShuffleBoardInfo()
     end
     local anySkillCount = 0
     for posId, entity in pairs(self.battleData:getGridEnties()) do
-        if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() then
+        if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() and not entity:getCantUpset() then
             if entity:getSkillId() then
                 local skillEntity = self:getSkillEntityBySkillId(entity:getSkillId())
                 local elementType = skillEntity:getPosition()

lua/app/module/hero/hero_const.lua

@@ -67,6 +67,6 @@ HeroConst.SHOW_NODE =
 
 HeroConst.TRIAL_HERO_ID = 34001 -- 花木兰
 HeroConst.TRIAL_HERO_MIN_CHAPTER = 2
-HeroConst.TRIAL_HERO_MAX_CHAPTER = 4
+HeroConst.TRIAL_HERO_MAX_CHAPTER = 5
 
 return HeroConst

lua/app/ui/main_city/cell/side_bar_discount_cell.lua

@@ -53,11 +53,12 @@ function SideBarDiscountCell:getSpineName()
 end
 
 function SideBarDiscountCell:onClick()
+    DataManager.ShopData:markEntranceDiscountRedPoint()
     EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.ShopConst.PAGE_TYPE.DISCOUNT})
 end
 
 function SideBarDiscountCell:getIsShowRedPoint()
-    return false
+    return DataManager.ShopData:getEntranceDiscountRedPoint()
 end
 
 return SideBarDiscountCell

lua/app/userdata/battle/battle_grid_entity.lua

@@ -446,6 +446,10 @@ function BattleGridEntity:getBftcTime()
     return self:getGridTypeConfig().bftc_time or 0
 end
 
+function BattleGridEntity:getCantUpset()
+    return self:getGridTypeConfig().cant_upset == 1
+end
+
 function BattleGridEntity:getEffectSfx()
     local sfxName = self:getGridTypeConfig().effect_sfx
     if not sfxName then

lua/app/userdata/shop/shop_data.lua

@@ -980,6 +980,14 @@ function ShopData:markShopDiscountRedPoint()
     LocalData:setShopDiscountRedPointTime(today)
 end
 
+function ShopData:getEntranceDiscountRedPoint()
+    return not self.isClickedDiscount
+end
+
+function ShopData:markEntranceDiscountRedPoint()
+    self.isClickedDiscount = true
+end
+
 function ShopData:checkLoginPopInfo()
     -- 初始化礼包弹出逻辑
     local actPopUpGifts = self:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.ACT_GIFT)