活动配置

Assets/Content/Config/LanguagePackage_cn.csv

@@ -10001,6 +10001,7 @@ LuckyEggExtraRewards,大獎預覽
 BTSmashEggsTips1,{0}獲得了{1}
 InsufficientRoGold,<color=#555E74>現有</color><color=#fe5478>RO幣不足</color>，<color=#555E74>可前往</color><color=#078DF5>盧恩商會</color><color=#555E74>購買</color>
 LuckyEggPlayExplain_10002,砸蛋連抽概率公示：\n概率公示內抽獎概率進行公佈，這些“概率”均在大樣本(大量用户)_下的統計數值，與單個玩家的少量測試數據之間可能存在一定差異。希望廣大玩家理性消費，健康遊戲。五連砸蛋概率(約50次保底)必出：大獎
+LuckyEggPlayExplain_19002,砸蛋連抽概率公示：\n概率公示內抽獎概率進行公佈，這些“概率”均在大樣本(大量用戶)_下的統計數值，與單個玩家的少量測試數據之間可能存在一定差異。希望廣大玩家理性消費，健康遊戲。五連砸蛋概率(約50次保底)必出：大獎；大獎獎池內每種獎品抽取概率均為1/21
 BtFirstCharge,累計儲值{0}＄
 Item15059,頭飾自選禮包
 Card12162,七彩大嘴鳥卡片
@@ -10022,4 +10023,5 @@ ic_buff_100011_Name,Name
 ic_buff_100011_Icon,buff/ic_buff_018
 DiffTaskConditionTxt,通關困難模式{0}  {1}/1
 DiffTaskTitleTxt,任務
-DiffGroupTaskConditionTxt,任務完成：{0}/{1}
+DiffGroupTaskConditionTxt,任務完成：{0}/{1}
+Notice_TeQuanKa,畢業特權卡以開放，購買特權後禮金使用額度將無上限。

Assets/Lua/Config/ActivitiesCfg.lua

@@ -2326,6 +2326,34 @@ local ActivitiesCfg = {
 ['RuleKey']='SetsWordActivityText',
 ['ExpiredActivities']=0,
 },
+[19001]={
+['Id']=19001,
+['Type']=21,
+['Name']='BT每日累儲',
+['Order']=1,
+['BG']='ActivityImg/dailyrecharge_bt_cn',
+['ActivityBG']='ActivityImg/dailyrecharge_bt_cn',
+['PageId']=379,
+['Entrance']={159},
+['NeedShow']=true,
+['NoPay']=true,
+['RuleKey']='',
+['ExpiredActivities']=0,
+},
+[19002]={
+['Id']=19002,
+['Type']=22,
+['Name']='砸彩蛋',
+['Order']=3,
+['BG']='ActivityImg/smasheggs_bt_cn',
+['ActivityBG']='',
+['PageId']=384,
+['Entrance']={159},
+['NeedShow']=true,
+['NoPay']=true,
+['RuleKey']='',
+['ExpiredActivities']=0,
+},
 [20001]={
 ['Id']=20001,
 ['Type']=7,

Assets/Lua/Config/ActivitiesTaskCfg.lua

@@ -8894,6 +8894,56 @@ local ActivitiesTaskCfg = {
      ['GoPageId']=117,
      ['ShowState']=1,
      ['Integral']=0,
+     },  
+          [20170]={
+     ['TaskId']=20170,
+     ['TaskCondition']={{60,0.99}},
+     ['Reward']={{54,88},{2,18888}},
+     ['Title']='活動期間累計儲值0.99$',
+     ['Desc']='',
+     ['GoPageId']=117,
+     ['ShowState']=1,
+     ['Integral']=0,
+     },      
+      [20171]={
+     ['TaskId']=20171,
+     ['TaskCondition']={{60,59.99}},
+     ['Reward']={{54,128},{2,28888}},
+     ['Title']='活動期間累計儲值59.99$',
+     ['Desc']='',
+     ['GoPageId']=117,
+     ['ShowState']=1,
+     ['Integral']=0,
+     },       
+     [20172]={
+     ['TaskId']=20172,
+     ['TaskCondition']={{60,99.99}},
+     ['Reward']={{54,158},{2,38888}},
+     ['Title']='活動期間累計儲值99.99$',
+     ['Desc']='',
+     ['GoPageId']=117,
+     ['ShowState']=1,
+     ['Integral']=0,
+     },       
+     [20173]={
+     ['TaskId']=20173,
+     ['TaskCondition']={{60,159.99}},
+     ['Reward']={{54,188},{2,58888}},
+     ['Title']='活動期間累計儲值159.99$',
+     ['Desc']='',
+     ['GoPageId']=117,
+     ['ShowState']=1,
+     ['Integral']=0,
+     },       
+     [20174]={
+     ['TaskId']=20174,
+     ['TaskCondition']={{60,249.99}},
+     ['Reward']={{54,228},{2,88888}},
+     ['Title']='活動期間累計儲值249.99$',
+     ['Desc']='',
+     ['GoPageId']=117,
+     ['ShowState']=1,
+     ['Integral']=0,
      },  
     }
     return ActivitiesTaskCfg

Assets/Lua/Config/BTSmashEggsCfg.lua

@@ -31,5 +31,21 @@ local BTSmashEggsCfg = {
 ['Show']={1007,1507,2007,3007,4007,5007,6007,7007,8007,9007,513,15042,15043,15044,15045,15046,15047,100,110,15061,},
 ['ClientShow']={{1007,1},{1507,1},{2007,1},{3007,1},{4007,1},{5007,1},{6007,1},{7007,1},{8007,1},{9007,1},{513,1},{15042,1},{15043,1},{15044,1},{15045,1},{15046,1},{15047,1},{100,100},{110,50},{15061,1},},
 },
+[2002]={
+['Id']=2002,
+['ShowImg']='UILuckyEgg/img_luckyegg_variegationegg',
+['Cost']={{54,10}},
+['Method']={1,5},
+['Total']=250,
+['SortId']=2,
+['ShowItemType']={7,16,9,21,48},
+['UnLock']=0,
+['ActivitiesId']=19002,
+['Type']=5,
+['StartDay']=7,
+['SummoType']=2001,
+['Show']={859,100,100,100,110,110,110,101,101,101,102,102,102,520,520,693,707,529,529,851,855,513,513,15042,15042,15043,15043,15044,15044,15045,15045,15046,15046,15047,15047,9013,},
+['ClientShow']={{859,1},{100,50},{100,100},{100,150},{110,30},{110,60},{110,90},{101,2000},{101,3000},{101,4000},{102,2000},{102,3000},{102,4000},{520,2},{520,5},{693,1},{707,1},{529,5},{529,10},{851,1},{855,1},{513,5},{513,10},{15042,2},{15042,5},{15043,2},{15043,5},{15044,2},{15044,5},{15045,2},{15045,5},{15046,2},{15046,5},{15047,2},{15047,5},{9013,1},},
+},
 }
 return BTSmashEggsCfg

Assets/Lua/Config/RuneShopGiftsCfg.lua

@@ -222,7 +222,7 @@ local RuneShopGiftsCfg = {
 ['Pic']='ShopIcons/ic_club_gold_30',
 ['Type']=1,
 ['RMB']=0.99,
-['Reward']={{102,55},{1,50000 }},
+['Reward']={{102,200},{1,50000 }},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
 ['SortId']=1,
@@ -234,7 +234,7 @@ local RuneShopGiftsCfg = {
 ['Pic']='ShopIcons/ic_club_gold_30',
 ['Type']=1,
 ['RMB']=0.99,
-['Reward']={{101,55},{1,50000 }},
+['Reward']={{101,300},{1,50000 }},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
 ['SortId']=1,
@@ -400,7 +400,7 @@ local RuneShopGiftsCfg = {
 ['Id']=41,
 ['Name']='日直购武器精炼包(惠)',
 ['Pic']='ShopIcons/market_weekbox1',
-['Type']=1,
+['Type']=3,
 ['RMB']=9.99,
 ['Reward']={{102,999},{1,5000000}},
 ['FirstBuyPic']='',
@@ -412,7 +412,7 @@ local RuneShopGiftsCfg = {
 ['Id']=42,
 ['Name']='日直购防具精炼包(惠)',
 ['Pic']='ShopIcons/market_weekbox1',
-['Type']=1,
+['Type']=3,
 ['RMB']=9.99,
 ['Reward']={{101,1999},{1,5000000}},
 ['FirstBuyPic']='',
@@ -424,7 +424,7 @@ local RuneShopGiftsCfg = {
 ['Id']=43,
 ['Name']='每日禮包(惠)',
 ['Pic']='ShopIcons/market_weekbox1',
-['Type']=1,
+['Type']=3,
 ['RMB']=0.99,
 ['Reward']={{102,200},{1,50000}},
 ['FirstBuyPic']='',
@@ -436,7 +436,7 @@ local RuneShopGiftsCfg = {
 ['Id']=44,
 ['Name']='每日禮包(惠)',
 ['Pic']='ShopIcons/market_weekbox1',
-['Type']=1,
+['Type']=3,
 ['RMB']=0.99,
 ['Reward']={{101,300},{1,50000}},
 ['FirstBuyPic']='',
@@ -448,7 +448,7 @@ local RuneShopGiftsCfg = {
 ['Id']=45,
 ['Name']='日購RO禮包',
 ['Pic']='ShopIcons/market_weekbox1',
-['Type']=1,
+['Type']=3,
 ['RMB']=0.99,
 ['Reward']={{54,500},{2,100000}},
 ['FirstBuyPic']='',
@@ -460,7 +460,7 @@ local RuneShopGiftsCfg = {
 ['Id']=46,
 ['Name']='周直购武器精炼包(惠)',
 ['Pic']='ShopIcons/market_weekbox1',
-['Type']=2,
+['Type']=3,
 ['RMB']=49.99,
 ['Reward']={{102,6666},{2,1000000}},
 ['FirstBuyPic']='',
@@ -472,7 +472,7 @@ local RuneShopGiftsCfg = {
 ['Id']=47,
 ['Name']='周直购防具精炼包(惠)',
 ['Pic']='ShopIcons/market_weekbox1',
-['Type']=2,
+['Type']=3,
 ['RMB']=49.99,
 ['Reward']={{101,12888},{2,1000000}},
 ['FirstBuyPic']='',
@@ -484,7 +484,7 @@ local RuneShopGiftsCfg = {
 ['Id']=48,
 ['Name']='周購RO禮包',
 ['Pic']='ShopIcons/market_weekbox1',
-['Type']=2,
+['Type']=3,
 ['RMB']=19.99,
 ['Reward']={{54,6666},{2,666600}},
 ['FirstBuyPic']='',
@@ -636,7 +636,54 @@ local RuneShopGiftsCfg = {
 ['SortId']=11,
 ['RmbTotalPay']=99,
 },
-
+[61]={
+['Id']=61,
+['Name']='每日禮包RO禮包1',
+['Pic']='ShopIcons/ic_club_gold_30',
+['Type']=1,
+['RMB']=0.99,
+['Reward']={{54,188}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[62]={
+['Id']=62,
+['Name']='每日禮包RO禮包2',
+['Pic']='ShopIcons/ic_club_gold_30',
+['Type']=1,
+['RMB']=9.99,
+['Reward']={{54,1288}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[63]={
+['Id']=63,
+['Name']='每日禮包RO禮包3',
+['Pic']='ShopIcons/ic_club_gold_30',
+['Type']=1,
+['RMB']=19.99,
+['Reward']={{54,1888}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[64]={
+['Id']=64,
+['Name']='每日禮包RO禮包4',
+['Pic']='ShopIcons/ic_club_gold_30',
+['Type']=1,
+['RMB']=49.99,
+['Reward']={{54,6888}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
 [100]={
 ['Id']=100,
 ['Name']='6000金幣',

Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://165.154.29.92:81//',
-	SERVERLIST_URL = 'http://165.154.29.92:81//serverlist',
-	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://165.154.29.92:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.29.92:81//vipService',
+	URL_KEY = 'http://110.40.223.119:81//',
+	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
+	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/TestServerNotice/',
+	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
 }
 
 return PlatformPack

Assets/Lua/Logic/LuckyEggDataMgr.lua

@@ -192,7 +192,7 @@ function LuckyEggDataMgr:SendLuckyEggReq(activity_id, draw_count, draw_type)
     if not self:IsCanSend(1) then
         return false
     end
-    
+    --LogError("抽取数据"..Inspect({ activity_id = activity_id, draw_type = draw_type, draw_count = draw_count }))
     ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_ACTIVITY_SMASH_EGGS_REQ, { activity_id = activity_id, draw_type = draw_type, draw_count = draw_count })
     return true
 end

Assets/Lua/Managers/LuaBattleMgr.lua

@@ -1259,7 +1259,11 @@ function LuaBattleMgr:OnLoadingClose()
       local cfg = ManagerContainer.CfgMgr:GetPrivilegeCardCfgByLv(2)
       local curmaplvID = self:GetCurLevelUniqueId()
        if cfg and cfg.UnlockCond and cfg.UnlockCond[2] == curmaplvID then
-        
+        ManagerContainer.LuaTimerMgr:AddTimer(500, 1,self,function ()
+            ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopBT)
+            --Notice_TeQuanKa
+            ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("Notice_TeQuanKa")
+        end,nil);
        end 
 
     end

Assets/Lua/UI/UILuckyEgg/UILuckyEggCtr.lua

@@ -41,8 +41,13 @@ end
 function UILuckyEggCtr:InitData()
 	local cfgs = {}
 	local cfgSource = ManagerContainer.CfgMgr:GetLuckyEggCfg()
+	--LogError("--------------------self.data.actId-- "..Inspect(self.data.actId))
 	for id, cfg in pairs(cfgSource) do
-		cfgs[#cfgs+1] = cfg
+		--LogError("----------------------"..Inspect(cfg))
+		if cfg.ActivitiesId ==  self.data.actId then
+			--LogError("----------------------"..Inspect(cfg))
+			cfgs[#cfgs+1] = cfg
+		end
 	end
 	table.sort(cfgs, function(a, b)
 		return a.SortId < b.SortId
@@ -92,6 +97,9 @@ function UILuckyEggCtr:GetCfgLength()
 	return self.cfgLength
 end
 
+function UILuckyEggCtr:GetCfgLength_cfg()
+	return  #self.cfgs
+end
 --- 获取额外奖励进度
 function UILuckyEggCtr:GetLuckyEggNumByIdx(idx)
 	local cfg = self:GetCfgByIdx(idx)
@@ -105,7 +113,10 @@ end
 function UILuckyEggCtr:CheckTotalRecharge()
 	local payNum = ManagerContainer.PayMgr:GetTotalRecharge() or 0
 	--- 彩蛋开放最低儲值金额
-	local needNum = 30
+	local needNum = 0
+	if #self.cfgs == 1 then
+		needNum = 0
+	end
 	self.eggActive = payNum >= needNum
 	--- 彩蛋儲值金额需要满足条件才能激活
 	self.cfgLength = self.eggActive and #self.cfgs or #self.cfgs - 1
@@ -114,6 +125,9 @@ end
 --- 根据当前儲值金额判断是否激活彩蛋
 ---@return boolean
 function UILuckyEggCtr:GetEggActiveByPay()
+	if #self.cfgs == 1 then
+		return true
+	end
 	return self.eggActive
 end
 

Assets/Lua/UI/UILuckyEgg/UILuckyEggView.lua

@@ -381,14 +381,24 @@ function UILuckyEggView:RefreshView()
 	local selectIdx = self.controller:GetSelectIdx()
 	local length = self.controller:GetCfgLength()
 	local cfg = self.controller:GetCfgByIdx(selectIdx)
-	if length <= 1 then
+	--LogError("length = "..length)
+	if length <= 1  then
 		self.btnArrowL:SetActive(false)
 		self.btnArrowR:SetActive(false)
+
 	else
 		self.btnArrowL:SetActive(true)
 		self.btnArrowR:SetActive(true)
 	end
 
+	if cfg and cfg.Type == 5 and self.controller:GetCfgLength_cfg() == 1 then
+		self.goldenEggToggle:SetActive(false)
+		self.variegationEggToggle:SetActive(true)
+	else
+		self.goldenEggToggle:SetActive(true)
+		self.variegationEggToggle:SetActive(false)
+	end
+
 	if not self.dots then self.dots = {} end
 	local num = #self.dots
 	local dot = nil
@@ -418,6 +428,9 @@ function UILuckyEggView:RefreshLuckyEggBtn()
 	self.controller:CheckTotalRecharge()
 	local selectIdx = self.controller:GetSelectIdx()
 	local cfg = self.controller:GetCfgByIdx(selectIdx)
+	if cfg == nil then
+		return
+	end
 	if cfg.UnLock and cfg.UnLock > 0 then
 		local result, val, content = ManagerContainer.UIFuncUnlockMgr:GetFuncLockStatusById(cfg.UnLock)
 		if not result then
@@ -444,6 +457,10 @@ end
 function UILuckyEggView:RefreshTopCurrency()
 	local selectIdx = self.controller:GetSelectIdx()
 	local cfg = self.controller:GetCfgByIdx(selectIdx)
+	if cfg == nil then
+		return
+	end
+
 	local costs = cfg.Cost
 	local num = costs and #costs or 0
 	local length = 0
@@ -520,6 +537,9 @@ end
 function UILuckyEggView:RefreshCostCurrency()
 	local selectIdx = self.controller:GetSelectIdx()
 	local cfg = self.controller:GetCfgByIdx(selectIdx)
+	if cfg == nil then
+		return
+	end
 	local method = cfg.Method
 	local costs = cfg.Cost
 	local costCfgId, costNum

Assets/Lua/UI/UIVoyage/UIVoyageRobberyView.lua

@@ -39,7 +39,7 @@ function UIVoyageRobberyView:Init()
 	self:RefreshView()
 	self:RefreshRobNum()
 	self.box:SetActive(true)
-	self.btnAdd:SetActive(true)
+	self.btnAdd:SetActive(false)
 	--self.robNum:SetActive(false)
 	self.transform:Find("UIAnimator/Window/BG/Title").gameObject:SetActive(true)
 end

Assets/Lua/UI/UIVoyage/UIVoyageView.lua

@@ -128,23 +128,25 @@ end
 
 
 function UIVoyageView:OnClickAddBtn()
-	--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {costNum, nil, self.SureBuyChallengeNumBtn, self})
-	--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UISimpleWeb, "https://www.baidu.com", nil, nil, nil, Enum.UISibling[Enum.UIType.Top] - 2)
-	local buyNum = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyNum()
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopBT)
+	--Notice_TeQuanKa
+	ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("Notice_TeQuanKa")
 	
-	local buyNumLimit = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyNumLimit()
+	-- local buyNum = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyNum()
+	
+	-- local buyNumLimit = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyNumLimit()
 
-	if (buyNumLimit - buyNum) <= 0 then
-		LogError("购买次数达到上限")
-		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("312")
-		return
-	end
+	-- if (buyNumLimit - buyNum) <= 0 then
+	-- 	LogError("购买次数达到上限")
+	-- 	ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("312")
+	-- 	return
+	-- end
 
 
-	local buyType = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyType()
-	local cost = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyCost()
-	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {cost, nil, self.SureBuyChallengeNumBtn, self,nil,buyType})
-	--ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ , {})
+	-- local buyType = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyType()
+	-- local cost = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyCost()
+	-- ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {cost, nil, self.SureBuyChallengeNumBtn, self,nil,buyType})
+	
 end
 
 

ProjectSettings/ProjectSettings.asset

@@ -846,7 +846,7 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
+    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;GAME_DEBUG
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
     iPhone: USE_LUA;VUPLEX_CCU