修改突破配置

Assets/Lua/Config/ParterProgressCfg.lua

@@ -1,10 +1,10 @@
 local ParterProgressCfg = {
 [10010]={
 ['Id']=10010,
-['Times']=15,
-['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000},
-['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500},
-['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200},
+['Times']=25,
+['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,35000000,35000000,40000000,40000000},
+['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500},
+['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300},
 ['Attribute1']={{7,500},{9,50},{11,25},{12,25}},
 ['Attribute2']={{7,1000},{9,100},{11,50},{12,50}},
 ['Attribute3']={{7,1500},{9,150},{11,75},{12,75}},
@@ -20,6 +20,16 @@ local ParterProgressCfg = {
 ['Attribute13']={{7,6500},{9,650},{11,325},{12,325}},
 ['Attribute14']={{7,8000},{9,700},{11,350},{12,350}},
 ['Attribute15']={{7,9500},{9,750},{11,375},{12,375}},
+['Attribute16']={{7,11000},{9,750},{11,400},{12,400}},
+['Attribute17']={{7,12500},{9,800},{11,425},{12,425}},
+['Attribute18']={{7,14000},{9,850},{11,450},{12,450}},
+['Attribute19']={{7,15500},{9,900},{11,475},{12,475}},
+['Attribute20']={{7,17000},{9,950},{11,500},{12,500}},
+['Attribute21']={{7,18500},{9,1000},{11,525},{12,525}},
+['Attribute22']={{7,20000},{9,1050},{11,550},{12,550}},
+['Attribute23']={{7,21500},{9,1100},{11,575},{12,575}},
+['Attribute24']={{7,23000},{9,1150},{11,600},{12,600}},
+['Attribute25']={{7,24500},{9,1200},{11,625},{12,625}},
 ['BreachTimes']=30,
 ['BreachAddLv']={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
 ['BreachMoney']={100000,200000,400000,800000,1600000,3200000,5000000,7000000,8500000,10000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000},
@@ -57,10 +67,10 @@ local ParterProgressCfg = {
 },
 [20010]={
 ['Id']=20010,
-['Times']=15,
-['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000},
-['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500},
-['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200},
+['Times']=25,
+['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,35000000,35000000,40000000,40000000},
+['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500},
+['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300},
 ['Attribute1']={{7,250},{10,100},{13,4},{15,2}},
 ['Attribute2']={{7,500},{10,200},{13,8},{15,4}},
 ['Attribute3']={{7,750},{10,300},{13,12},{15,6}},
@@ -76,6 +86,16 @@ local ParterProgressCfg = {
 ['Attribute13']={{7,3250},{10,1300},{13,52},{15,26}},
 ['Attribute14']={{7,4000},{10,1400},{13,56},{15,28}},
 ['Attribute15']={{7,4750},{10,1500},{13,60},{15,30}},
+['Attribute16']={{7,5500},{10,1600},{13,64},{15,32}},
+['Attribute17']={{7,5525},{10,1700},{13,68},{15,34}},
+['Attribute18']={{7,5550},{10,1800},{13,72},{15,36}},
+['Attribute19']={{7,5575},{10,1900},{13,76},{15,38}},
+['Attribute20']={{7,5600},{10,2000},{13,80},{15,40}},
+['Attribute21']={{7,5625},{10,2100},{13,84},{15,42}},
+['Attribute22']={{7,5650},{10,2200},{13,88},{15,44}},
+['Attribute23']={{7,5675},{10,2300},{13,92},{15,46}},
+['Attribute24']={{7,5700},{10,2400},{13,96},{15,48}},
+['Attribute25']={{7,5725},{10,2500},{13,100},{15,50}},
 ['BreachTimes']=30,
 ['BreachAddLv']={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
 ['BreachMoney']={100000,200000,400000,800000,1600000,3200000,5000000,7000000,8500000,10000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000},
@@ -113,10 +133,10 @@ local ParterProgressCfg = {
 },
 [30010]={
 ['Id']=30010,
-['Times']=15,
-['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000},
-['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500},
-['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200},
+['Times']=25,
+['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,35000000,35000000,40000000,40000000},
+['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500},
+['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300},
 ['Attribute1']={{7,300},{9,90},{15,4},{16,3}},
 ['Attribute2']={{7,600},{9,180},{15,8},{16,6}},
 ['Attribute3']={{7,900},{9,270},{15,12},{16,9}},
@@ -132,6 +152,16 @@ local ParterProgressCfg = {
 ['Attribute13']={{7,3900},{9,1170},{15,52},{16,39}},
 ['Attribute14']={{7,4800},{9,1260},{15,56},{16,42}},
 ['Attribute15']={{7,5700},{9,1350},{15,60},{16,45}},
+['Attribute16']={{7,6600},{9,1440},{15,64},{16,48}},
+['Attribute17']={{7,7500},{9,1530},{15,68},{16,51}},
+['Attribute18']={{7,8400},{9,1620},{15,72},{16,54}},
+['Attribute19']={{7,9300},{9,1710},{15,76},{16,57}},
+['Attribute20']={{7,10200},{9,1800},{15,80},{16,60}},
+['Attribute21']={{7,11100},{9,1890},{15,84},{16,63}},
+['Attribute22']={{7,12000},{9,1980},{15,88},{16,66}},
+['Attribute23']={{7,12900},{9,2070},{15,92},{16,69}},
+['Attribute24']={{7,13800},{9,2160},{15,96},{16,72}},
+['Attribute25']={{7,14700},{9,2250},{15,100},{16,75}},
 ['BreachTimes']=30,
 ['BreachAddLv']={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
 ['BreachMoney']={100000,200000,400000,800000,1600000,3200000,5000000,7000000,8500000,10000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000},
@@ -169,10 +199,10 @@ local ParterProgressCfg = {
 },
 [40010]={
 ['Id']=40010,
-['Times']=15,
-['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000},
-['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500},
-['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200},
+['Times']=25,
+['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,35000000,35000000,40000000,40000000},
+['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500},
+['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300},
 ['Attribute1']={{7,200},{9,100},{14,3},{15,4}},
 ['Attribute2']={{7,400},{9,200},{14,6},{15,8}},
 ['Attribute3']={{7,600},{9,300},{14,9},{15,12}},
@@ -188,6 +218,16 @@ local ParterProgressCfg = {
 ['Attribute13']={{7,2600},{9,1300},{14,39},{15,52}},
 ['Attribute14']={{7,3200},{9,1400},{14,42},{15,56}},
 ['Attribute15']={{7,3800},{9,1500},{14,45},{15,60}},
+['Attribute16']={{7,4400},{9,1600},{14,48},{15,64}},
+['Attribute17']={{7,5000},{9,1700},{14,51},{15,68}},
+['Attribute18']={{7,5600},{9,1800},{14,54},{15,72}},
+['Attribute19']={{7,6200},{9,1900},{14,57},{15,76}},
+['Attribute20']={{7,6800},{9,2000},{14,60},{15,80}},
+['Attribute21']={{7,7400},{9,2100},{14,63},{15,84}},
+['Attribute22']={{7,8000},{9,2200},{14,66},{15,88}},
+['Attribute23']={{7,8600},{9,2300},{14,69},{15,92}},
+['Attribute24']={{7,9200},{9,2400},{14,72},{15,96}},
+['Attribute25']={{7,9800},{9,2500},{14,75},{15,100}},
 ['BreachTimes']=30,
 ['BreachAddLv']={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
 ['BreachMoney']={100000,200000,400000,800000,1600000,3200000,5000000,7000000,8500000,10000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000},
@@ -225,10 +265,10 @@ local ParterProgressCfg = {
 },
 [50010]={
 ['Id']=50010,
-['Times']=15,
-['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000},
-['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500},
-['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200},
+['Times']=25,
+['CostMoney']={30000,90000,270000,810000,1620000,2500000,3500000,5000000,7000000,9000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,35000000,35000000,40000000,40000000},
+['CostStone']={20,50,100,300,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500},
+['AddLv']={20,40,60,80,90,100,110,120,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300},
 ['Attribute1']={{7,300},{10,85},{14,3},{16,5}},
 ['Attribute2']={{7,600},{10,170},{14,6},{16,10}},
 ['Attribute3']={{7,900},{10,255},{14,9},{16,15}},
@@ -244,6 +284,16 @@ local ParterProgressCfg = {
 ['Attribute13']={{7,3900},{10,1200},{14,39},{16,65}},
 ['Attribute14']={{7,4800},{10,1300},{14,42},{16,70}},
 ['Attribute15']={{7,5700},{10,1400},{14,45},{16,75}},
+['Attribute16']={{7,6600},{10,1500},{14,51},{16,80}},
+['Attribute17']={{7,7500},{10,1600},{14,54},{16,85}},
+['Attribute18']={{7,8400},{10,1700},{14,57},{16,90}},
+['Attribute19']={{7,9300},{10,1800},{14,60},{16,95}},
+['Attribute20']={{7,10200},{10,1900},{14,63},{16,100}},
+['Attribute21']={{7,11100},{10,2000},{14,66},{16,105}},
+['Attribute22']={{7,12000},{10,2100},{14,69},{16,110}},
+['Attribute23']={{7,12900},{10,2200},{14,72},{16,115}},
+['Attribute24']={{7,13800},{10,2300},{14,75},{16,120}},
+['Attribute25']={{7,14700},{10,2400},{14,78},{16,125}},
 ['BreachTimes']=30,
 ['BreachAddLv']={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
 ['BreachMoney']={100000,200000,400000,800000,1600000,3200000,5000000,7000000,8500000,10000000,10000000,10000000,10000000,15000000,15000000,20000000,20000000,25000000,25000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000,30000000},

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/UI/UIRoleMain/UIPartnerLvUpView.lua

@@ -102,6 +102,10 @@ function UIPartnerLvUpView:Refresh()
 			local num1 = math.floor((logicData.advanceLevel - 1) / 5 + 1)
 			local idx1 = (logicData.advanceLevel - 1) % 5 + 1
 			local step = self.popLvUp.grid["step"..idx]
+			--LogError("前 num = "..num)
+			num = num > 5 and 5 or num
+			num1 = num1 > 5 and 5 or num1
+			--LogError("num = "..num)
 			if num < num1 then
 				step["ic"..num]:SetActive(true)
 			elseif num == num1 then
@@ -424,6 +428,8 @@ function UIPartnerLvUpView:RefreshAdvenceSuccessWnd()
 			local num1 = math.floor((logicData.advanceLevel - 1) / 5 + 1)
 			local idx1 = (logicData.advanceLevel - 1) % 5 + 1
 			local step = self.popEvolutionOK.grid["step"..idx]
+			num = num > 5 and 5 or num
+			num1 = num1 > 5 and 5 or num1
 			if num < num1 then
 				step["ic"..num]:SetActive(true)
 			elseif num == num1 then

Assets/Src/Core/DownLoad/AssetDownloader.cs

@@ -32,7 +32,7 @@ public class AssetDownloader : SingletonMono<AssetDownloader>
     {
         if (!CancelDownLoad && HasNotDownloadedEntity())
         {
-            while (HasIdleTask())
+            if (HasIdleTask())
             {
                 DownloadTask task = FindIdleTask();
                 //

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: WentingTec
-  productName: "\u521D\u5FC3\u8005\u5927\u5192\u96AA"
+  productName: "\u5FC3\u529B\u7269\u8BED"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1.0
+  bundleVersion: 1.0.0.6
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -846,7 +846,7 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU
+    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;BUGLY;FPS_DISABLE