merge master

lua/app/common/bi_report.lua

@@ -1126,4 +1126,15 @@ function BIReport:postRateOpen()
 	self:report(EVENT_NAME_MISCELLANEOUS_OPT, args)
 end
 
+function BIReport:postPbAuthfailed(pbName, lastLoginInfo, authFailToLogin)
+	local args = {
+		event_type = BIReport.NETWORK_OPT_TYPE.AUTH_FAILED,
+		pb_name = pbName,
+		ui_name = UIManager:getTopUIIndex(),
+		lastLoginInfo = lastLoginInfo,
+		authFailToLogin = authFailToLogin
+	}
+	self:report(EVENT_NAME_NETWORK_OPT, args)
+end
+
 return BIReport

lua/app/common/data_manager.lua

@@ -154,6 +154,7 @@ function DataManager:initWithServerData(data)
 	self.ShopData:initIntroductGift(data.act_introductory_gift) -- 入门礼包
 	-- 商店礼包都初始化完了后检查一下每日红点
 	self.ShopData:checkShopDiscountRedPoint()
+	self.ShopData:checkLoginPopInfo() -- 需要写在shopdata所有初始化之后
 	self.SummonData:init(data.summon, true)
 	self.AIHelperData:init(nil, true)
 	-- 成长基金要在ShopData和PlayerDataBagData还有之后初始化，依赖这些数据

lua/app/config/chapter.lua

@@ -117,7 +117,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=5,
-		["idle_gold"]=6,
+		["idle_gold"]=10,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -268,7 +268,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=6,
-		["idle_gold"]=6,
+		["idle_gold"]=10,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -414,7 +414,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=6,
-		["idle_gold"]=7,
+		["idle_gold"]=13,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -611,7 +611,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=7,
-		["idle_gold"]=7,
+		["idle_gold"]=13,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -808,7 +808,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=7,
-		["idle_gold"]=8,
+		["idle_gold"]=19,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -1011,7 +1011,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=8,
-		["idle_gold"]=8,
+		["idle_gold"]=19,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -1230,7 +1230,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=8,
-		["idle_gold"]=9,
+		["idle_gold"]=25,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -1246,8 +1246,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			4312,
+			4456,
-			8220
+			7506
 		}
 	},
 	[8]={
@@ -1449,7 +1449,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=9,
-		["idle_gold"]=9,
+		["idle_gold"]=25,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -1465,8 +1465,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			6450,
+			6127,
-			11469
+			10184
 		}
 	},
 	[9]={
@@ -1668,7 +1668,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=9,
-		["idle_gold"]=10,
+		["idle_gold"]=31,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -1684,8 +1684,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			8301,
+			7787,
-			14462
+			12470
 		}
 	},
 	[10]={
@@ -1887,7 +1887,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=10,
-		["idle_gold"]=10,
+		["idle_gold"]=31,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -1903,8 +1903,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			10982,
+			10159,
-			18505
+			15963
 		}
 	},
 	[11]={
@@ -2106,7 +2106,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=10,
-		["idle_gold"]=11,
+		["idle_gold"]=37,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -2122,8 +2122,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			13769,
+			12466,
-			22904
+			18556
 		}
 	},
 	[12]={
@@ -2325,7 +2325,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=12,
-		["idle_gold"]=11,
+		["idle_gold"]=37,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -2341,8 +2341,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			15314,
+			14126,
-			25531
+			21487
 		}
 	},
 	[13]={
@@ -2544,7 +2544,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=12,
-		["idle_gold"]=12,
+		["idle_gold"]=42,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -2560,8 +2560,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			16480,
+			15225,
-			27745
+			23424
 		}
 	},
 	[14]={
@@ -2763,7 +2763,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=14,
-		["idle_gold"]=12,
+		["idle_gold"]=42,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -2779,8 +2779,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			18736,
+			17392,
-			31527
+			26737
 		}
 	},
 	[15]={
@@ -2982,7 +2982,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=14,
-		["idle_gold"]=13,
+		["idle_gold"]=47,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -2998,8 +2998,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			19549,
+			18125,
-			33209
+			28176
 		}
 	},
 	[16]={
@@ -3201,7 +3201,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=16,
-		["idle_gold"]=13,
+		["idle_gold"]=47,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -3217,8 +3217,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			21283,
+			19440,
-			36273
+			30378
 		}
 	},
 	[17]={
@@ -3420,7 +3420,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=16,
-		["idle_gold"]=14,
+		["idle_gold"]=48,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -3436,8 +3436,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			22572,
+			20691,
-			38814
+			32484
 		}
 	},
 	[18]={
@@ -3639,7 +3639,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=18,
-		["idle_gold"]=14,
+		["idle_gold"]=48,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -3655,8 +3655,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			24526,
+			22146,
-			42259
+			34908
 		}
 	},
 	[19]={
@@ -3858,7 +3858,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=18,
-		["idle_gold"]=15,
+		["idle_gold"]=49,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -3874,8 +3874,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			25462,
+			23030,
-			44223
+			36601
 		}
 	},
 	[20]={
@@ -4077,7 +4077,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=20,
-		["idle_gold"]=15,
+		["idle_gold"]=49,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -4093,8 +4093,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			27698,
+			24712,
-			48175
+			39364
 		}
 	},
 	[21]={
@@ -4296,7 +4296,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=20,
-		["idle_gold"]=16,
+		["idle_gold"]=50,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -4312,8 +4312,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			29160,
+			26059,
-			50972
+			41629
 		}
 	},
 	[22]={
@@ -4515,7 +4515,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=22,
-		["idle_gold"]=16,
+		["idle_gold"]=50,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -4531,8 +4531,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30163,
+			26965,
-			53011
+			43375
 		}
 	},
 	[23]={
@@ -4734,7 +4734,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=22,
-		["idle_gold"]=17,
+		["idle_gold"]=51,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -4750,8 +4750,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			31641,
+			27859,
-			55823
+			45058
 		}
 	},
 	[24]={
@@ -4953,7 +4953,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=24,
-		["idle_gold"]=17,
+		["idle_gold"]=51,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -4969,8 +4969,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			33421,
+			29509,
-			59208
+			47863
 		}
 	},
 	[25]={
@@ -5172,7 +5172,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=24,
-		["idle_gold"]=18,
+		["idle_gold"]=52,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -5188,8 +5188,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			34235,
+			29800,
-			61086
+			48678
 		}
 	},
 	[26]={
@@ -5391,7 +5391,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=26,
-		["idle_gold"]=18,
+		["idle_gold"]=52,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -5407,8 +5407,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			35232,
+			30716,
-			63226
+			50392
 		}
 	},
 	[27]={
@@ -5610,7 +5610,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=26,
-		["idle_gold"]=19,
+		["idle_gold"]=53,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -5626,8 +5626,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			37754,
+			32506,
-			67926
+			53451
 		}
 	},
 	[28]={
@@ -5829,7 +5829,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=28,
-		["idle_gold"]=19,
+		["idle_gold"]=53,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -5845,8 +5845,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			38690,
+			33303,
-			69940
+			55081
 		}
 	},
 	[29]={
@@ -6048,7 +6048,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=28,
-		["idle_gold"]=20,
+		["idle_gold"]=54,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -6064,8 +6064,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			39682,
+			34166,
-			72090
+			56796
 		}
 	},
 	[30]={
@@ -6267,7 +6267,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=30,
-		["idle_gold"]=20,
+		["idle_gold"]=54,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -6283,8 +6283,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			42644,
+			35718,
-			77559
+			60278
 		}
 	},
 	[31]={
@@ -6486,7 +6486,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=30,
-		["idle_gold"]=21,
+		["idle_gold"]=55,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -6502,8 +6502,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			44613,
+			37410,
-			81355
+			63294
 		}
 	},
 	[32]={
@@ -6705,7 +6705,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=32,
-		["idle_gold"]=21,
+		["idle_gold"]=55,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -6721,8 +6721,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			47068,
+			38984,
-			86071
+			66067
 		}
 	},
 	[33]={
@@ -6924,7 +6924,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=32,
-		["idle_gold"]=22,
+		["idle_gold"]=56,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -6940,8 +6940,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			50158,
+			41000,
-			91751
+			69592
 		}
 	},
 	[34]={
@@ -7143,7 +7143,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=34,
-		["idle_gold"]=22,
+		["idle_gold"]=56,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -7159,8 +7159,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			52014,
+			42574,
-			95452
+			72471
 		}
 	},
 	[35]={
@@ -7361,7 +7361,7 @@ local chapter = {
 			}
 		},
 		["idle_exp"]=34,
-		["idle_gold"]=23,
+		["idle_gold"]=57,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -7377,8 +7377,8 @@ local chapter = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			56321,
+			46207,
-			103271
+			78535
 		}
 	}
 }

lua/app/config/chapter_board.lua

@@ -4724,6 +4724,34 @@ local chapter_board = {
 				1,
 				0
 			},
+			{
+				0,
+				0
+			},
+			{
+				0,
+				0
+			},
+			{
+				5,
+				1
+			},
+			{
+				0,
+				0
+			},
+			{
+				0,
+				0
+			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
 			{
 				5,
 				2
@@ -4734,7 +4762,7 @@ local chapter_board = {
 			},
 			{
 				14,
-				3
+				0
 			},
 			{
 				5,
@@ -4772,34 +4800,6 @@ local chapter_board = {
 				1,
 				0
 			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
 			{
 				1,
 				0

lua/app/config/chapter_dungeon_gold.lua

@@ -14,16 +14,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=800,
+			["num"]=2000,
- 			["num_for_nothing"]="Xghc"
+ 			["num_for_nothing"]="VAhcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=2000,
+			["num"]=4000,
- 			["num_for_nothing"]="VAhcAw=="
+ 			["num_for_nothing"]="UghcAw=="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -50,16 +50,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1000,
+			["num"]=3000,
- 			["num_for_nothing"]="VwhcAw=="
+ 			["num_for_nothing"]="VQhcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=2500,
+			["num"]=6000,
- 			["num_for_nothing"]="VA1cAw=="
+ 			["num_for_nothing"]="UAhcAw=="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -86,16 +86,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1200,
+			["num"]=4000,
- 			["num_for_nothing"]="VwpcAw=="
+ 			["num_for_nothing"]="UghcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=3000,
+			["num"]=8000,
- 			["num_for_nothing"]="VQhcAw=="
+ 			["num_for_nothing"]="XghcAw=="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -122,16 +122,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1400,
+			["num"]=4500,
- 			["num_for_nothing"]="VwxcAw=="
+ 			["num_for_nothing"]="Ug1cAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=3500,
+			["num"]=9000,
- 			["num_for_nothing"]="VQ1cAw=="
+ 			["num_for_nothing"]="XwhcAw=="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -158,16 +158,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1600,
+			["num"]=5000,
- 			["num_for_nothing"]="Vw5cAw=="
+ 			["num_for_nothing"]="UwhcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=4000,
+			["num"]=10000,
- 			["num_for_nothing"]="UghcAw=="
+ 			["num_for_nothing"]="VwhcA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -194,16 +194,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1800,
+			["num"]=5500,
- 			["num_for_nothing"]="VwBcAw=="
+ 			["num_for_nothing"]="Uw1cAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=4500,
+			["num"]=11000,
- 			["num_for_nothing"]="Ug1cAw=="
+ 			["num_for_nothing"]="VwlcA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -230,16 +230,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=2000,
+			["num"]=6000,
- 			["num_for_nothing"]="VAhcAw=="
+ 			["num_for_nothing"]="UAhcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=5000,
+			["num"]=12000,
- 			["num_for_nothing"]="UwhcAw=="
+ 			["num_for_nothing"]="VwpcA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -266,16 +266,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=2200,
+			["num"]=6500,
- 			["num_for_nothing"]="VApcAw=="
+ 			["num_for_nothing"]="UA1cAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=5500,
+			["num"]=13000,
- 			["num_for_nothing"]="Uw1cAw=="
+ 			["num_for_nothing"]="VwtcA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -302,16 +302,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=2400,
+			["num"]=6800,
- 			["num_for_nothing"]="VAxcAw=="
+ 			["num_for_nothing"]="UABcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=6000,
+			["num"]=13600,
- 			["num_for_nothing"]="UAhcAw=="
+ 			["num_for_nothing"]="VwtaA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -338,16 +338,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=2600,
+			["num"]=7200,
- 			["num_for_nothing"]="VA5cAw=="
+ 			["num_for_nothing"]="UQpcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=6500,
+			["num"]=14400,
- 			["num_for_nothing"]="UA1cAw=="
+ 			["num_for_nothing"]="VwxYA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -374,16 +374,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=2800,
+			["num"]=7500,
- 			["num_for_nothing"]="VABcAw=="
+ 			["num_for_nothing"]="UQ1cAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=7000,
+			["num"]=15000,
- 			["num_for_nothing"]="UQhcAw=="
+ 			["num_for_nothing"]="Vw1cA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -410,16 +410,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=3000,
+			["num"]=7800,
- 			["num_for_nothing"]="VQhcAw=="
+ 			["num_for_nothing"]="UQBcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=7500,
+			["num"]=15600,
- 			["num_for_nothing"]="UQ1cAw=="
+ 			["num_for_nothing"]="Vw1aA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -446,16 +446,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=3200,
+			["num"]=8200,
- 			["num_for_nothing"]="VQpcAw=="
+ 			["num_for_nothing"]="XgpcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=8000,
+			["num"]=16400,
- 			["num_for_nothing"]="XghcAw=="
+ 			["num_for_nothing"]="Vw5YA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -482,16 +482,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=3400,
+			["num"]=8500,
- 			["num_for_nothing"]="VQxcAw=="
+ 			["num_for_nothing"]="Xg1cAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=8500,
+			["num"]=17000,
- 			["num_for_nothing"]="Xg1cAw=="
+ 			["num_for_nothing"]="Vw9cA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={
@@ -518,16 +518,16 @@ local chapter_dungeon_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=3600,
+			["num"]=8800,
- 			["num_for_nothing"]="VQ5cAw=="
+ 			["num_for_nothing"]="XgBcAw=="
 		},
 		["first_pass_reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=9000,
+			["num"]=17600,
- 			["num_for_nothing"]="XwhcAw=="
+ 			["num_for_nothing"]="Vw9aA2U="
 		},
 		["wave_limit"]=30,
 		["effect"]={

lua/app/module/battle/helper/battle_board_touch_helper.lua

@@ -130,7 +130,6 @@ function BattleBoardTouchHelper:onLinkEnter(entity, posId, isVirtual)
             skillPosId = posId
         end
     end
-    self.battleUI:showBoardMask(maskElementType, skillPosId)
 
     self.battleData:insertGridSequence(posId, self.battleController:snapshotBoard(), isVirtual)
     if lastEntity:getNeedChangePos() and not entity:getNeedChangePos() then -- 需要移动到队列末尾
@@ -138,6 +137,7 @@ function BattleBoardTouchHelper:onLinkEnter(entity, posId, isVirtual)
         local skillId = entity:getSkillId()
         self.battleController:setGridSkillId(lastPosId, skillId)
         self.battleController:setGridSkillId(posId, lastSkillId)
+        skillPosId = posId
     end
 
     local newElementType = elementType or lastElementType
@@ -145,6 +145,7 @@ function BattleBoardTouchHelper:onLinkEnter(entity, posId, isVirtual)
         entity:setElementType(newElementType)
         lastEntity:setElementType(newElementType)
     end
+    self.battleUI:showBoardMask(maskElementType, skillPosId)
 
     entity:addLinkSkillCount()
 

lua/app/module/chapter/chapter_manager.lua

@@ -160,6 +160,10 @@ function ChapterManager:endFightFinish(result)
             DataManager.ShopData:onTriggerIntroductGift()
         end
 
+        if not reqData.win then
+            DataManager.ShopData:markPopLastChapterActGift()
+        end
+
         ModuleManager.TaskManager:addFightTaskProgress(reqData.task_stat)
     end
 end

lua/app/module/maincity/maincity_const.lua

@@ -40,6 +40,7 @@ MainCityConst.RIGHT_SIDE_BARS = {
 	-- "app/ui/main_city/cell/side_bar_first_recharge_cell", 已作废
 	"app/ui/main_city/cell/side_bar_introduct_gift_cell",
 	"app/ui/main_city/cell/side_bar_beginner_gift_cell",
+	"app/ui/main_city/cell/side_bar_discount_cell",
 	"app/ui/main_city/cell/side_bar_grow_up_gift_cell",
 }
 

lua/app/net/net_manager.lua

@@ -983,6 +983,11 @@ function NetManager:closeAndClear()
         self.joinChatId = nil
     end
 
+    if self.autoReAuthSid then
+        SchedulerManager:unscheduleGlobal(self.autoReAuthSid)
+        self.autoReAuthSid = nil
+    end
+
     self.isSending = false
     self.sendQueue = {}
     self.tillBeforeOverCount = 0

lua/app/ui/hero/hero_detail_ui.lua

@@ -178,6 +178,9 @@ function HeroDetailUI:_bind()
     self:bind(self.heroEntity, "lv", function()
         self:_display(true)
     end)
+    self:bind(DataManager.BagData.ItemData:getItemById(GConst.ItemConst.ITEM_ID_GOLD), "isDirty", function()
+		self:_display()
+	end)
 end
 
 function HeroDetailUI:_initSpineObjs()

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

@@ -0,0 +1,63 @@
+local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell"
+local SideBarDiscountCell = class("SideBarDiscountCell", SideBarBaseCellComp)
+
+function SideBarDiscountCell:getModuleKey()
+    return nil
+end
+
+function SideBarDiscountCell:getHasPurchase()
+    return true
+end
+
+function SideBarDiscountCell:getIsOpen()
+    -- 同ShopComp:refreshDiscountPage() 一起修改
+    if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then
+        return false
+    end
+
+    -- 章节礼包
+    if #DataManager.ShopData:getActChapterStoreCanBuyActIds() > 0 then
+        return true
+    end
+
+    -- 新手礼包
+    if not DataManager.ShopData:getBeginnerGiftHasBuy() then
+        return true
+    end
+
+    -- 竞技场
+    if DataManager.ArenaData:getGiftId() ~= nil then
+        return true
+    end
+
+    -- 助力礼包
+    if #DataManager.ShopData:getLevelUpGiftActIds() > 0 then
+        return true
+    end
+
+    -- 成长礼包
+    if DataManager.ShopData:hasGrowUpGift() then
+        return true
+    end
+
+    -- 金币
+    if DataManager.ShopData:getValidCoinGiftId() ~= nil  then
+        return true
+    end
+
+    return false
+end
+
+function SideBarDiscountCell:getSpineName()
+    return "ui_main_btn_indulgencegift"
+end
+
+function SideBarDiscountCell:onClick()
+    EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.ShopConst.PAGE_TYPE.DISCOUNT})
+end
+
+function SideBarDiscountCell:getIsShowRedPoint()
+    return false
+end
+
+return SideBarDiscountCell

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

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 61356e1192048c44aaa97e5f210a046e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/ui/shop/shop_comp.lua

@@ -277,6 +277,7 @@ function ShopComp:refreshTime()
 end
 
 function ShopComp:refreshDiscountPage()
+	-- 同SideBarDiscountCell:getIsOpen()一起修改
 	local y = 0
 	local cellHeight = 0
 	-- 章节

lua/app/userdata/shop/shop_data.lua

@@ -895,4 +895,22 @@ function ShopData:markShopDiscountRedPoint()
     LocalData:setShopDiscountRedPointTime(today)
 end
 
+function ShopData:checkLoginPopInfo()
+    -- 初始化礼包弹出逻辑
+    local actPopUpGifts = self:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.ACT_GIFT)
+    if not actPopUpGifts or #actPopUpGifts <= 0 then
+        self:markPopLastChapterActGift()
+    end
+end
+
+function ShopData:markPopLastChapterActGift()
+    local chapterPopUpGifts = self:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT)
+    if not chapterPopUpGifts or #chapterPopUpGifts <= 0 then
+        local list = self:getActChapterStoreCanBuyActIds()
+        if list and list[1] then
+            self:markPopUpGift(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT, list[#list])
+        end
+    end
+end
+
 return ShopData