神器配置

Assets/Content/Config/GlobalCfg.csv

@@ -298,7 +298,7 @@ int,string,int,string,float
 309,現金商店提現獎勵,,2:1100;26:1000,
 310,提現確認獎勵預覽圖片,,ShopIcons/ic_club_gold_128,
 311,自動挑戰等待時間,1,,
-312,潛能果實增加屬性,,528:10:120;529:100:120,
+312,潛能果實增加屬性,,528:10:300;529:100:300,
 313,通用技能寵物ID,851,,
 314,寵物體型變化係數,,0:1;3:1.15;6:1.22;9:1.3;12:1.35;15:1.40;18:1.45;21:1.50;24:1.55;27:1.6,
 315,等級參數;技能等級參數,,999;500,

Assets/Lua/Config/ArtifactExpCfg.lua

@@ -496,7 +496,507 @@ local ArtifactExpCfg = {
 },
 [100]={
 ['ArtifactLevel']=100,
-['Nature']={{21,800}},
+['UpgradeCost']={{48,13400},{1,1000000}},
+['Nature']={{21,798}},
+},
+[101]={
+['ArtifactLevel']=101,
+['UpgradeCost']={{48,13900},{1,1010000}},
+['Nature']={{21,810}},
+},
+[102]={
+['ArtifactLevel']=102,
+['UpgradeCost']={{48,14400},{1,1020000}},
+['Nature']={{21,822}},
+},
+[103]={
+['ArtifactLevel']=103,
+['UpgradeCost']={{48,14900},{1,1030000}},
+['Nature']={{21,834}},
+},
+[104]={
+['ArtifactLevel']=104,
+['UpgradeCost']={{48,15400},{1,1040000}},
+['Nature']={{21,846}},
+},
+[105]={
+['ArtifactLevel']=105,
+['UpgradeCost']={{48,15900},{1,1050000}},
+['Nature']={{21,858}},
+},
+[106]={
+['ArtifactLevel']=106,
+['UpgradeCost']={{48,16400},{1,1060000}},
+['Nature']={{21,870}},
+},
+[107]={
+['ArtifactLevel']=107,
+['UpgradeCost']={{48,16900},{1,1070000}},
+['Nature']={{21,882}},
+},
+[108]={
+['ArtifactLevel']=108,
+['UpgradeCost']={{48,17400},{1,1080000}},
+['Nature']={{21,894}},
+},
+[109]={
+['ArtifactLevel']=109,
+['UpgradeCost']={{48,17900},{1,1090000}},
+['Nature']={{21,906}},
+},
+[110]={
+['ArtifactLevel']=110,
+['UpgradeCost']={{48,18400},{1,1100000}},
+['Nature']={{21,918}},
+},
+[111]={
+['ArtifactLevel']=111,
+['UpgradeCost']={{48,18900},{1,1110000}},
+['Nature']={{21,930}},
+},
+[112]={
+['ArtifactLevel']=112,
+['UpgradeCost']={{48,19400},{1,1120000}},
+['Nature']={{21,942}},
+},
+[113]={
+['ArtifactLevel']=113,
+['UpgradeCost']={{48,19900},{1,1130000}},
+['Nature']={{21,954}},
+},
+[114]={
+['ArtifactLevel']=114,
+['UpgradeCost']={{48,20400},{1,1140000}},
+['Nature']={{21,966}},
+},
+[115]={
+['ArtifactLevel']=115,
+['UpgradeCost']={{48,20900},{1,1150000}},
+['Nature']={{21,978}},
+},
+[116]={
+['ArtifactLevel']=116,
+['UpgradeCost']={{48,21400},{1,1160000}},
+['Nature']={{21,990}},
+},
+[117]={
+['ArtifactLevel']=117,
+['UpgradeCost']={{48,21900},{1,1170000}},
+['Nature']={{21,1002}},
+},
+[118]={
+['ArtifactLevel']=118,
+['UpgradeCost']={{48,22400},{1,1180000}},
+['Nature']={{21,1014}},
+},
+[119]={
+['ArtifactLevel']=119,
+['UpgradeCost']={{48,22900},{1,1190000}},
+['Nature']={{21,1026}},
+},
+[120]={
+['ArtifactLevel']=120,
+['UpgradeCost']={{48,23400},{1,1200000}},
+['Nature']={{21,1038}},
+},
+[121]={
+['ArtifactLevel']=121,
+['UpgradeCost']={{48,23900},{1,1210000}},
+['Nature']={{21,1050}},
+},
+[122]={
+['ArtifactLevel']=122,
+['UpgradeCost']={{48,24400},{1,1220000}},
+['Nature']={{21,1062}},
+},
+[123]={
+['ArtifactLevel']=123,
+['UpgradeCost']={{48,24900},{1,1230000}},
+['Nature']={{21,1074}},
+},
+[124]={
+['ArtifactLevel']=124,
+['UpgradeCost']={{48,25400},{1,1240000}},
+['Nature']={{21,1086}},
+},
+[125]={
+['ArtifactLevel']=125,
+['UpgradeCost']={{48,25900},{1,1250000}},
+['Nature']={{21,1098}},
+},
+[126]={
+['ArtifactLevel']=126,
+['UpgradeCost']={{48,26400},{1,1260000}},
+['Nature']={{21,1110}},
+},
+[127]={
+['ArtifactLevel']=127,
+['UpgradeCost']={{48,26900},{1,1270000}},
+['Nature']={{21,1122}},
+},
+[128]={
+['ArtifactLevel']=128,
+['UpgradeCost']={{48,27400},{1,1280000}},
+['Nature']={{21,1134}},
+},
+[129]={
+['ArtifactLevel']=129,
+['UpgradeCost']={{48,27900},{1,1290000}},
+['Nature']={{21,1146}},
+},
+[130]={
+['ArtifactLevel']=130,
+['UpgradeCost']={{48,28400},{1,1300000}},
+['Nature']={{21,1158}},
+},
+[131]={
+['ArtifactLevel']=131,
+['UpgradeCost']={{48,28900},{1,1310000}},
+['Nature']={{21,1170}},
+},
+[132]={
+['ArtifactLevel']=132,
+['UpgradeCost']={{48,29400},{1,1320000}},
+['Nature']={{21,1182}},
+},
+[133]={
+['ArtifactLevel']=133,
+['UpgradeCost']={{48,29900},{1,1330000}},
+['Nature']={{21,1194}},
+},
+[134]={
+['ArtifactLevel']=134,
+['UpgradeCost']={{48,30400},{1,1340000}},
+['Nature']={{21,1206}},
+},
+[135]={
+['ArtifactLevel']=135,
+['UpgradeCost']={{48,30900},{1,1350000}},
+['Nature']={{21,1218}},
+},
+[136]={
+['ArtifactLevel']=136,
+['UpgradeCost']={{48,31400},{1,1360000}},
+['Nature']={{21,1230}},
+},
+[137]={
+['ArtifactLevel']=137,
+['UpgradeCost']={{48,31900},{1,1370000}},
+['Nature']={{21,1242}},
+},
+[138]={
+['ArtifactLevel']=138,
+['UpgradeCost']={{48,32400},{1,1380000}},
+['Nature']={{21,1254}},
+},
+[139]={
+['ArtifactLevel']=139,
+['UpgradeCost']={{48,32900},{1,1390000}},
+['Nature']={{21,1266}},
+},
+[140]={
+['ArtifactLevel']=140,
+['UpgradeCost']={{48,33400},{1,1400000}},
+['Nature']={{21,1278}},
+},
+[141]={
+['ArtifactLevel']=141,
+['UpgradeCost']={{48,33900},{1,1410000}},
+['Nature']={{21,1290}},
+},
+[142]={
+['ArtifactLevel']=142,
+['UpgradeCost']={{48,34400},{1,1420000}},
+['Nature']={{21,1302}},
+},
+[143]={
+['ArtifactLevel']=143,
+['UpgradeCost']={{48,34900},{1,1430000}},
+['Nature']={{21,1314}},
+},
+[144]={
+['ArtifactLevel']=144,
+['UpgradeCost']={{48,35400},{1,1440000}},
+['Nature']={{21,1326}},
+},
+[145]={
+['ArtifactLevel']=145,
+['UpgradeCost']={{48,35900},{1,1450000}},
+['Nature']={{21,1338}},
+},
+[146]={
+['ArtifactLevel']=146,
+['UpgradeCost']={{48,36400},{1,1460000}},
+['Nature']={{21,1350}},
+},
+[147]={
+['ArtifactLevel']=147,
+['UpgradeCost']={{48,36900},{1,1470000}},
+['Nature']={{21,1362}},
+},
+[148]={
+['ArtifactLevel']=148,
+['UpgradeCost']={{48,37400},{1,1480000}},
+['Nature']={{21,1374}},
+},
+[149]={
+['ArtifactLevel']=149,
+['UpgradeCost']={{48,37900},{1,1490000}},
+['Nature']={{21,1386}},
+},
+[150]={
+['ArtifactLevel']=150,
+['UpgradeCost']={{48,38400},{1,1500000}},
+['Nature']={{21,1398}},
+},
+[151]={
+['ArtifactLevel']=151,
+['UpgradeCost']={{48,38900},{1,1510000}},
+['Nature']={{21,1410}},
+},
+[152]={
+['ArtifactLevel']=152,
+['UpgradeCost']={{48,39400},{1,1520000}},
+['Nature']={{21,1422}},
+},
+[153]={
+['ArtifactLevel']=153,
+['UpgradeCost']={{48,39900},{1,1530000}},
+['Nature']={{21,1434}},
+},
+[154]={
+['ArtifactLevel']=154,
+['UpgradeCost']={{48,40400},{1,1540000}},
+['Nature']={{21,1446}},
+},
+[155]={
+['ArtifactLevel']=155,
+['UpgradeCost']={{48,40900},{1,1550000}},
+['Nature']={{21,1458}},
+},
+[156]={
+['ArtifactLevel']=156,
+['UpgradeCost']={{48,41400},{1,1560000}},
+['Nature']={{21,1470}},
+},
+[157]={
+['ArtifactLevel']=157,
+['UpgradeCost']={{48,41900},{1,1570000}},
+['Nature']={{21,1482}},
+},
+[158]={
+['ArtifactLevel']=158,
+['UpgradeCost']={{48,42400},{1,1580000}},
+['Nature']={{21,1494}},
+},
+[159]={
+['ArtifactLevel']=159,
+['UpgradeCost']={{48,42900},{1,1590000}},
+['Nature']={{21,1506}},
+},
+[160]={
+['ArtifactLevel']=160,
+['UpgradeCost']={{48,43400},{1,1600000}},
+['Nature']={{21,1518}},
+},
+[161]={
+['ArtifactLevel']=161,
+['UpgradeCost']={{48,43900},{1,1610000}},
+['Nature']={{21,1530}},
+},
+[162]={
+['ArtifactLevel']=162,
+['UpgradeCost']={{48,44400},{1,1620000}},
+['Nature']={{21,1542}},
+},
+[163]={
+['ArtifactLevel']=163,
+['UpgradeCost']={{48,44900},{1,1630000}},
+['Nature']={{21,1554}},
+},
+[164]={
+['ArtifactLevel']=164,
+['UpgradeCost']={{48,45400},{1,1640000}},
+['Nature']={{21,1566}},
+},
+[165]={
+['ArtifactLevel']=165,
+['UpgradeCost']={{48,45900},{1,1650000}},
+['Nature']={{21,1578}},
+},
+[166]={
+['ArtifactLevel']=166,
+['UpgradeCost']={{48,46400},{1,1660000}},
+['Nature']={{21,1590}},
+},
+[167]={
+['ArtifactLevel']=167,
+['UpgradeCost']={{48,46900},{1,1670000}},
+['Nature']={{21,1602}},
+},
+[168]={
+['ArtifactLevel']=168,
+['UpgradeCost']={{48,47400},{1,1680000}},
+['Nature']={{21,1614}},
+},
+[169]={
+['ArtifactLevel']=169,
+['UpgradeCost']={{48,47900},{1,1690000}},
+['Nature']={{21,1626}},
+},
+[170]={
+['ArtifactLevel']=170,
+['UpgradeCost']={{48,48400},{1,1700000}},
+['Nature']={{21,1638}},
+},
+[171]={
+['ArtifactLevel']=171,
+['UpgradeCost']={{48,48900},{1,1710000}},
+['Nature']={{21,1650}},
+},
+[172]={
+['ArtifactLevel']=172,
+['UpgradeCost']={{48,49400},{1,1720000}},
+['Nature']={{21,1662}},
+},
+[173]={
+['ArtifactLevel']=173,
+['UpgradeCost']={{48,49900},{1,1730000}},
+['Nature']={{21,1674}},
+},
+[174]={
+['ArtifactLevel']=174,
+['UpgradeCost']={{48,50400},{1,1740000}},
+['Nature']={{21,1686}},
+},
+[175]={
+['ArtifactLevel']=175,
+['UpgradeCost']={{48,50900},{1,1750000}},
+['Nature']={{21,1698}},
+},
+[176]={
+['ArtifactLevel']=176,
+['UpgradeCost']={{48,51400},{1,1760000}},
+['Nature']={{21,1710}},
+},
+[177]={
+['ArtifactLevel']=177,
+['UpgradeCost']={{48,51900},{1,1770000}},
+['Nature']={{21,1722}},
+},
+[178]={
+['ArtifactLevel']=178,
+['UpgradeCost']={{48,52400},{1,1780000}},
+['Nature']={{21,1734}},
+},
+[179]={
+['ArtifactLevel']=179,
+['UpgradeCost']={{48,52900},{1,1790000}},
+['Nature']={{21,1746}},
+},
+[180]={
+['ArtifactLevel']=180,
+['UpgradeCost']={{48,53400},{1,1800000}},
+['Nature']={{21,1758}},
+},
+[181]={
+['ArtifactLevel']=181,
+['UpgradeCost']={{48,53900},{1,1810000}},
+['Nature']={{21,1770}},
+},
+[182]={
+['ArtifactLevel']=182,
+['UpgradeCost']={{48,54400},{1,1820000}},
+['Nature']={{21,1782}},
+},
+[183]={
+['ArtifactLevel']=183,
+['UpgradeCost']={{48,54900},{1,1830000}},
+['Nature']={{21,1794}},
+},
+[184]={
+['ArtifactLevel']=184,
+['UpgradeCost']={{48,55400},{1,1840000}},
+['Nature']={{21,1806}},
+},
+[185]={
+['ArtifactLevel']=185,
+['UpgradeCost']={{48,55900},{1,1850000}},
+['Nature']={{21,1818}},
+},
+[186]={
+['ArtifactLevel']=186,
+['UpgradeCost']={{48,56400},{1,1860000}},
+['Nature']={{21,1830}},
+},
+[187]={
+['ArtifactLevel']=187,
+['UpgradeCost']={{48,56900},{1,1870000}},
+['Nature']={{21,1842}},
+},
+[188]={
+['ArtifactLevel']=188,
+['UpgradeCost']={{48,57400},{1,1880000}},
+['Nature']={{21,1854}},
+},
+[189]={
+['ArtifactLevel']=189,
+['UpgradeCost']={{48,57900},{1,1890000}},
+['Nature']={{21,1866}},
+},
+[190]={
+['ArtifactLevel']=190,
+['UpgradeCost']={{48,58400},{1,1900000}},
+['Nature']={{21,1878}},
+},
+[191]={
+['ArtifactLevel']=191,
+['UpgradeCost']={{48,58900},{1,1910000}},
+['Nature']={{21,1890}},
+},
+[192]={
+['ArtifactLevel']=192,
+['UpgradeCost']={{48,59400},{1,1920000}},
+['Nature']={{21,1902}},
+},
+[193]={
+['ArtifactLevel']=193,
+['UpgradeCost']={{48,59900},{1,1930000}},
+['Nature']={{21,1914}},
+},
+[194]={
+['ArtifactLevel']=194,
+['UpgradeCost']={{48,60400},{1,1940000}},
+['Nature']={{21,1926}},
+},
+[195]={
+['ArtifactLevel']=195,
+['UpgradeCost']={{48,60900},{1,1950000}},
+['Nature']={{21,1938}},
+},
+[196]={
+['ArtifactLevel']=196,
+['UpgradeCost']={{48,61400},{1,1960000}},
+['Nature']={{21,1950}},
+},
+[197]={
+['ArtifactLevel']=197,
+['UpgradeCost']={{48,61900},{1,1970000}},
+['Nature']={{21,1962}},
+},
+[198]={
+['ArtifactLevel']=198,
+['UpgradeCost']={{48,62400},{1,1980000}},
+['Nature']={{21,1974}},
+},
+[199]={
+['ArtifactLevel']=199,
+['UpgradeCost']={{48,62900},{1,1990000}},
+['Nature']={{21,1986}},
+},
+[200]={
+['ArtifactLevel']=200,
+['Nature']={{21,2000}},
 },
 }
 return ArtifactExpCfg

Assets/Lua/Config/ShopCfg.lua

@@ -4041,7 +4041,7 @@ local ShopCfg = {
 ['GoodsId']=90034,
 ['GoodsName']='契約卷軸',
 ['GoodsDesc']='',
-['GoodsItem']=364,
+['GoodsItem']=264,
 ['PayForType']=153,
 ['SortId']=29,
 ['GoodsPic']='',
@@ -4066,7 +4066,7 @@ local ShopCfg = {
 },
 [90037]={
 ['GoodsId']=90037,
-['GoodsName']='天使之泪50个',
+['GoodsName']='天使之泪',
 ['GoodsDesc']='',
 ['GoodsItem']=100,
 ['PayForType']=153,
@@ -4075,7 +4075,7 @@ local ShopCfg = {
 },
 [90038]={
 ['GoodsId']=90038,
-['GoodsName']='命运绳结50个',
+['GoodsName']='命运绳结',
 ['GoodsDesc']='',
 ['GoodsItem']=110,
 ['PayForType']=153,

Assets/Lua/Managers/LoginMgr.lua

@@ -514,7 +514,7 @@ function LoginMgr:CheckServerSuccess()
         return
     end
     local ok, result = RO_XPCALL(JSON.decode, debug.traceback, JSON, self.checkWWW.text)
-    LogError("[wboy] CheckServer " .. tostring(self.checkWWW.text))
+    --LogError("[wboy] CheckServer " .. tostring(self.checkWWW.text))
     if ok then
        
         self:SetServerInfo(result)

Assets/Lua/UI/UIRoleMain/UIFruitUseView.lua

@@ -115,6 +115,7 @@ end
 
 --使用果实请求返回消息
 function UIFruitUseView:OnAddFruitBack(data)
+		--LogError(Inspect(data))
 		self:InitUIInfo()
 		local index = self.controller:GetHeroDataIndex(data[1]) + 1
 		FruitHeroItemCtr:SetData(self,self["hero"..index],data[2],self.cfgData,self.itemCfgData)