ybx_Gdn 1 rok temu
rodzic
commit
830c08c68d

+ 12 - 12
Assets/Lua/Config/ActivitiesCollectionCfg.lua

@@ -979,7 +979,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=13,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22100,1}},
 ['ActivitiesId']=10,
 },
@@ -989,7 +989,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=14,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22101,1}},
 ['ActivitiesId']=10,
 },
@@ -999,7 +999,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=15,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22102,1}},
 ['ActivitiesId']=10,
 },
@@ -1009,7 +1009,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=16,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22103,1}},
 ['ActivitiesId']=10,
 },
@@ -1019,7 +1019,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=17,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22104,1}},
 ['ActivitiesId']=10,
 },
@@ -1029,7 +1029,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=18,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22105,1}},
 ['ActivitiesId']=10,
 },
@@ -1039,7 +1039,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=19,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22106,1}},
 ['ActivitiesId']=10,
 },
@@ -1049,7 +1049,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=20,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22107,1}},
 ['ActivitiesId']=10,
 },
@@ -1059,7 +1059,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=21,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22108,1}},
 ['ActivitiesId']=10,
 },
@@ -1069,7 +1069,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=22,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22109,1}},
 ['ActivitiesId']=10,
 },
@@ -1079,7 +1079,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=23,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22110,1}},
 ['ActivitiesId']=10,
 },
@@ -1089,7 +1089,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=24,
 ['ExchangeCondition']={{166,666}},
 ['ServersReward']=0,
-['Number']=1,
+['Number']=99,
 ['Reward']={{22111,1}},
 ['ActivitiesId']=10,
 },

+ 23 - 1
Assets/Lua/Config/ItemCfg2.lua

@@ -6562,7 +6562,7 @@ local ItemCfg2 = {
         ['MiniIcon'] = '',
         ['Job'] = 0,
         ['ComposeItem'] = { { 529, 10 }, { 346, 1 }, { 347, 1 }, { 357, 1 }, { 356, 1 }, { 358, 1 }, { 361, 1 }, { 316, 1 }, { 322, 1 }, { 323, 1 }, { 315, 1 } },
-        ['Describe'] = '打開可選擇高級潛能果實*10、糖果繽紛,小惡魔,春暖花開,花開蹁躚、頭號玩家,歡樂童年,雲遊探索,美食盛宴,萌萌柴犬,沙灘度假中的1種\n請勿重複選擇,重複選擇後會自行分解',
+        ['Describe'] = '打開可選擇Mvp頂級卡包',
         ['ItemTime'] = 0,
         ['SkipInterface'] = 0,
         ['DebrisShow'] = 0,
@@ -6882,6 +6882,28 @@ local ItemCfg2 = {
         ['ActivationItem'] = 0,
         ['ItemTimeCd'] = 0,
     },
+    [15120] = {
+        ['Id'] = 15120,
+        ['Name'] = 'Mvp頂級自選卡包',
+        ['ResType'] = 32,
+        ['Quality'] = 4,
+        ['Composition'] = 9999,
+        ['AutoUse'] = 0,
+        ['NeedLevel'] = 0,
+        ['Bang'] = 0,
+        ['Icon'] = 'Items/Box3',
+        ['MiniIcon'] = '',
+        ['Job'] = 0,
+        ['ComposeItem'] = { { 22100, 1 }, { 22101, 1 }, { 22102, 1 }, { 22103, 1 }, { 22104, 1 }, { 22105, 1 }, { 22106, 1 }, { 22107, 1 }, { 22108, 1 }, { 22109, 1 }, { 22110, 1 }, { 22111, 1 } },
+        ['Describe'] = '打開可選擇Mvp頂級卡包',
+        ['ItemTime'] = 0,
+        ['SkipInterface'] = 0,
+        ['DebrisShow'] = 0,
+        ['NeedRP'] = true,
+        ['NatureType'] = 0,
+        ['ActivationItem'] = 0,
+        ['ItemTimeCd'] = 0,
+    },
     [16001] = {
         ['Id'] = 16001,
         ['Name'] = '飛鼠印記',

+ 12 - 0
Assets/Lua/Config/RuneShopGiftsCfg.lua

@@ -684,6 +684,18 @@ local RuneShopGiftsCfg = {
 ['SortId']=1,
 ['RmbTotalPay']=0,
 },
+[65]={
+['Id']=65,
+['Name']='Mvp頂級自選卡包',
+['Pic']='ShopIcons/market_giftbox13',
+['Type']=1,
+['RMB']=49.99,
+['Reward']={{15120,2}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
 [100]={
 ['Id']=100,
 ['Name']='6000金幣',

+ 9 - 9
Assets/Lua/Config/ShopCfg.lua

@@ -37,8 +37,8 @@ local ShopCfg = {
 },
 [10005]={
 ['GoodsId']=10005,
-['GoodsName']='元宵禮盒',
-['GoodsDesc']='打開元宵禮盒可獲得:如意燈(獲取途徑:芝麻湯圓+桂花湯圓+豆沙湯圓,兑換獲得)',
+['GoodsName']='黃金周禮盒',
+['GoodsDesc']='打開黃金周禮盒有概率獲得:金齒輪(獲取途徑:工程師徽章+瓦泥匠徽章+園藝師徽章,兌換獲得)',
 ['GoodsItem']=167,
 ['PayForType']=2,
 ['SortId']=28,
@@ -46,8 +46,8 @@ local ShopCfg = {
 },
 [10006]={
 ['GoodsId']=10006,
-['GoodsName']='芝麻湯圓',
-['GoodsDesc']='用於兑換元宵禮盒的必要禮品',
+['GoodsName']='工程師徽章',
+['GoodsDesc']='用於兌換"黃金周禮盒"的必要材料之一',
 ['GoodsItem']=169,
 ['PayForType']=2,
 ['SortId']=29,
@@ -55,8 +55,8 @@ local ShopCfg = {
 },
 [10007]={
 ['GoodsId']=10007,
-['GoodsName']='桂花湯圓',
-['GoodsDesc']='用於兑換元宵禮盒的必要禮品',
+['GoodsName']='園藝師徽章',
+['GoodsDesc']='用於兌換"黃金周禮盒"的必要材料之一',
 ['GoodsItem']=170,
 ['PayForType']=2,
 ['SortId']=30,
@@ -64,8 +64,8 @@ local ShopCfg = {
 },
 [10008]={
 ['GoodsId']=10008,
-['GoodsName']='豆沙湯圓',
-['GoodsDesc']='用於兑換元宵禮盒的必要禮品',
+['GoodsName']='瓦泥匠徽章',
+['GoodsDesc']='用於兌換"黃金周禮盒"的必要材料之一',
 ['GoodsItem']=171,
 ['PayForType']=2,
 ['SortId']=31,
@@ -73,7 +73,7 @@ local ShopCfg = {
 },
 [10009]={
 ['GoodsId']=10009,
-['GoodsName']='心巧克力',
+['GoodsName']='心巧克力',
 ['GoodsDesc']='可在女神節向羅拉送禮,收穫10點好感度,活動結束可兑換成銀幣(獲取途徑:雜貨店)',
 ['GoodsItem']=207,
 ['PayForType']=54,

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

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	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',
+	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',
 }
 
 return PlatformPack

+ 1 - 1
ProjectSettings/ProjectSettings.asset

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