Ver código fonte

自动挑战

123 1 ano atrás
pai
commit
861afe9c6d

+ 2 - 0
Assets/Content/Config/GlobalCfg.csv

@@ -348,3 +348,5 @@ int,string,int,string,float
 361,充值钱包返回后的关卡及引导id,,10001:20,
 362,挑战者大厅购买次数消耗,,2:50000;2:60000;2:80000;2:100000;2:120000;2:150000,
 363,最大关卡ID,580100,,
+364,远航最大购买次数,5,,
+365,自动爬塔计时秒数,10,,

Diferenças do arquivo suprimidas por serem muito extensas
+ 261 - 68
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


+ 3 - 1
Assets/Editor/Pack/PackConstant.cs

@@ -45,7 +45,9 @@ namespace Pack
             "FPS_DISABLE",
             "HEALTH_BULLETIN",
             "LEBIAN_YUN_CLIENT",
-            "GAME_DEBUG"
+            "GAME_DEBUG",
+             "GAME_ONE",
+             "CN_I7GAME_0_1"
         };
 
         public static readonly string[] BuildScenes = {

+ 5 - 5
Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://101.43.46.101:81//',
-	SERVERLIST_URL = 'http://101.43.46.101:81//serverlist',
-	NOTIFY_URL = 'http://101.43.46.101:88//res/TestServerNotice/',
-	SPECIAL_INFO_URL = 'http://101.43.46.101:88//res/Channel/agreement.json',
-	CUSTOMER_SERVICE_INFO_URL = 'http://101.43.46.101:81//vipService',
+	URL_KEY = 'http://103.239.245.64:81//',
+	SERVERLIST_URL = 'http://103.239.245.64:81//serverlist',
+	NOTIFY_URL = 'http://103.239.245.64:88//res/TestServerNotice/',
+	SPECIAL_INFO_URL = 'http://103.239.245.64:88//res/Channel/agreement.json',
+	CUSTOMER_SERVICE_INFO_URL = 'http://103.239.245.64:81//vipService',
 }
 
 return PlatformPack

+ 1 - 1
Assets/Lua/Managers/LoginMgr.lua

@@ -445,7 +445,7 @@ function LoginMgr:StartCheckServer(isAgain)
     ManagerContainer.LuaBattleMgr:ResetBattleMode()
     self.checkServerAgain = isAgain
     local openId = ManagerContainer.LuaGameMgr.openId  --"8bb8f18b-aeef-1b79-db12-a825"--generateDeviceId()--
-    --LogError("OpenID = "..openId);
+    LogError("OpenID = "..openId);
     if not openId or openId == '' then
         openId = UnityEngine.PlayerPrefs.GetString("LoginName")
     end

+ 4 - 0
Assets/Lua/UI/UIClimbingTower/UIClimbingTowerBattleWinCtr.lua

@@ -35,6 +35,10 @@ function UIClimbingTowerBattleWinCtr:BackPageId()
 	return self.data[1]
 end
 
+function UIClimbingTowerBattleWinCtr:IsClimbingTower()
+	return Enum.UIPageName.UIClimbingTower == self:GetLastUITowerType()
+end
+
 function UIClimbingTowerBattleWinCtr:EnterNextBattle()
 	TowerDataMgr:SendClimbingTowerBeginReq(TowerDataMgr:GetCurChallengeLevel())
 end

+ 47 - 3
Assets/Lua/UI/UIClimbingTower/UIClimbingTowerBattleWinView.lua

@@ -23,12 +23,23 @@ function UIClimbingTowerBattleWinView:FillContent(data, uiBase)
 end
 
 function UIClimbingTowerBattleWinView:Init()
-	self:SetRewardInfo(self.controller:GetLevelRewards())
+    self.curTime = 0
+    self.maxTime = 0
+    self:SetRewardInfo(self.controller:GetLevelRewards())
+
+    local type = self.controller:GetLastUITowerType()
+    self.btnNextTower:SetActive(type == Enum.UnlimitTowerType.ClimbingTower)
+	LogError("ClimbingTower = "..tostring(type))
+    if type == Enum.UnlimitTowerType.ClimbingTower then
+        self:AutoPlayTimer()
+		LogError("ClimbingTower = ClimbingTower")
+    else
+        self.autoPlay:SetActive(false)
+    end
 
-	local type = self.controller:GetLastUITowerType()
-	self.btnNextTower:SetActive(type == Enum.UnlimitTowerType.ClimbingTower)
 end
 
+
 function UIClimbingTowerBattleWinView:SetRewardInfo(rewardData)
 	if rewardData~= nil then
 		self.ItemScrollView:SetActive(true)
@@ -84,6 +95,12 @@ function UIClimbingTowerBattleWinView:OnClickClose()
 		ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_SHUT_TIMEBATTLE,self.controller:BackPageId())
 	end
 	ManagerContainer.LuaUIMgr:ClosePage(self.uiBase.PageId)
+
+	if self.curTimer ~= nil then
+		ManagerContainer.LuaTimerMgr:RemoveTimer(self.curTimer)
+		self.curTimer = nil
+	end
+
 end
 
 function UIClimbingTowerBattleWinView:OnClickItem(btn,params)
@@ -91,5 +108,32 @@ function UIClimbingTowerBattleWinView:OnClickItem(btn,params)
 	ManagerContainer.LuaUIMgr:OpenTips(logicData)
 end
 
+function UIClimbingTowerBattleWinView:AutoPlayTimer()
+	self.autoPlay:SetActive(true)
+	self.maxTime = GlobalConfig.Instance:GetConfigIntValue(365)
+	self.curTime =0
+	self.curTimer = nil
+	self:StartTimer()
+end
+
+
+function  UIClimbingTowerBattleWinView:StartTimer()
+
+	self.timersTxt.text.text = tostring(self.maxTime)
+	self.curTimer = ManagerContainer.LuaTimerMgr:AddTimer(1000, self.maxTime, self, self.UpdateTimer, nil)
+end
+
+
+function UIClimbingTowerBattleWinView:UpdateTimer()
+    self.curTime = self.curTime + 1
+    self.timersTxt.text.text = tostring(self.maxTime - self.curTime)
+    if (self.maxTime == self.curTime) then
+        ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_SHUT_TIMEBATTLE, self.controller:BackPageId())     
+        self.controller:EnterNextBattle()
+		self.curTimer = nil
+		--ManagerContainer.LuaUIMgr:ClosePage(self.uiBase.PageId)
+    end
+end
+
 return UIClimbingTowerBattleWinView
 

+ 2 - 0
Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -118,6 +118,8 @@ public class DownloadMgr : Singleton<DownloadMgr>
     {
 #if GAME_ONE
         return "http://101.43.46.101:88/";
+#elif CN_I7GAME_0_1
+        return "http://103.239.245.64:88/";
 #elif GAME_DEBUG
          return "http://110.40.223.119:88/";
 #else

+ 1 - 1
ProjectSettings/ProjectSettings.asset

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

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff