Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

lua/app/ui/battle/battle_result_ui.lua

@@ -195,7 +195,7 @@ function BattleResultUI:tryShowGoldPig()
     local currGemCount = DataManager.GoldPigData:getCount()
     local maxGemCount = DataManager.GoldPigData:getMaxCount()
     if lastGemCount > currGemCount then
-        lastGemCount = 0
+        lastGemCount = currGemCount
     end
     self.goldPigGemTx:setText("+" .. currGemCount - lastGemCount)
     GFunc.centerImgAndTx(self.goldPigGemImg, self.goldPigGemTx, 0, -4)

lua/app/ui/main_city/cell/side_bar_idle_cell.lua

@@ -9,8 +9,8 @@ function SideBarIdleCell:getIsOpen()
     return DataManager.IdleData:getIsOpen()
 end
 
-function SideBarIdleCell:getIconRes()
-    return "main_btn_hang"
+function SideBarIdleCell:getSpineName()
+    return "ui_main_btn_hang"
 end
 
 function SideBarIdleCell:onClick()

lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua

@@ -9,8 +9,8 @@ function SideBarSevenDaysCell:getIsOpen()
     return DataManager.SevenDayData:getIsOpen()
 end
 
-function SideBarSevenDaysCell:getIconRes()
-    return "main_btn_sevenday"
+function SideBarSevenDaysCell:getSpineName()
+    return "ui_main_btn_sevenday"
 end
 
 function SideBarSevenDaysCell:onClick()

lua/app/userdata/activity/gold_pig/gold_pig_data.lua

@@ -70,6 +70,7 @@ function GoldPigData:checkOpen()
 		self.nextShowTime = self.endTime + self:getTimeOverCD()
 		if Time:getServerTime() >= self.endTime then -- 超过时间该消失了
 			self.data.isOpen = false
+			self:levelDown()
 		else
 			self.data.isOpen = true
 			DataManager:registerDataCd("GoldPigData")
@@ -96,6 +97,7 @@ function GoldPigData:addGoldPigCount()
 		return
 	end
 	if self.data.count >= info.max_diamond then -- 已经满了
+		self.lastCount = self.data.count
 		return
 	end
 	self.lastCount = self.data.count