123 1 год назад
Родитель
Сommit
6d54390e80

+ 56 - 64
Assets/Lua/Config/ShopCfg.lua

@@ -3755,7 +3755,7 @@ local ShopCfg = {
 ['GoodsDesc']='特性1:羣體暈眩\n特性2:概率提升我方全體隊友暴擊&暴傷\n特性3:入場提升全員魔法攻擊',
 ['GoodsItem']=849,
 ['PayForType']=153,
-['SortId']=6,
+['SortId']=7,
 ['GoodsPic']='',
 },
 [90002]={
@@ -3764,7 +3764,7 @@ local ShopCfg = {
 ['GoodsDesc']='部位:帽子\n物攻 +370\n魔攻 +370\n暴擊傷害 +2%\n法力值 +16',
 ['GoodsItem']=12191,
 ['PayForType']=153,
-['SortId']=18,
+['SortId']=19,
 ['GoodsPic']='',
 },
 [90003]={
@@ -3778,11 +3778,11 @@ local ShopCfg = {
 },
 [90004]={
 ['GoodsId']=90004,
-['GoodsName']='色1階裝備',
-['GoodsDesc']='打開後隨機獲得一件色1階裝備',
-['GoodsItem']=607,
+['GoodsName']='色1階裝備',
+['GoodsDesc']='打開後隨機獲得一件色1階裝備',
+['GoodsItem']=610,
 ['PayForType']=153,
-['SortId']=31,
+['SortId']=32,
 ['GoodsPic']='',
 },
 [90005]={
@@ -3791,7 +3791,7 @@ local ShopCfg = {
 ['GoodsDesc']='集齊20個Mvp卡片碎片,可獲得1張Mvp卡片(獲取途徑:盧恩商會,世界BOSS)',
 ['GoodsItem']=531,
 ['PayForType']=153,
-['SortId']=42,
+['SortId']=41,
 ['GoodsPic']='',
 },
 [90006]={
@@ -3800,7 +3800,7 @@ local ShopCfg = {
 ['GoodsDesc']='集齊20個Mvp寵物碎片,可獲得1個Mvp類型的寵物',
 ['GoodsItem']=517,
 ['PayForType']=153,
-['SortId']=43,
+['SortId']=42,
 ['GoodsPic']='',
 },
 [90007]={
@@ -3809,25 +3809,34 @@ local ShopCfg = {
 ['GoodsDesc']='使用後可直接獲得100000寵物經驗',
 ['GoodsItem']=141,
 ['PayForType']=153,
-['SortId']=44,
+['SortId']=46,
 ['GoodsPic']='',
 },
-[90010]={
-['GoodsId']=90010,
+[90009]={
+['GoodsId']=90009,
 ['GoodsName']='迎新聚寶盆',
-['GoodsDesc']='',
+['GoodsDesc']='迎新聚宝盆可以开出天使翅膀装饰',
 ['GoodsItem']=15011,
 ['PayForType']=153,
 ['SortId']=1,
 ['GoodsPic']='',
 },
+[90010]={
+['GoodsId']=90010,
+['GoodsName']='宠物-莎拉艾琳',
+['GoodsDesc']='',
+['GoodsItem']=859,
+['PayForType']=153,
+['SortId']=2,
+['GoodsPic']='',
+},
 [90011]={
 ['GoodsId']=90011,
 ['GoodsName']='红色一阶装备',
 ['GoodsDesc']='',
 ['GoodsItem']=613,
 ['PayForType']=153,
-['SortId']=2,
+['SortId']=3,
 ['GoodsPic']='',
 },
 [90012]={
@@ -3836,7 +3845,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=853,
 ['PayForType']=153,
-['SortId']=3,
+['SortId']=4,
 ['GoodsPic']='',
 },
 [90013]={
@@ -3845,7 +3854,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=852,
 ['PayForType']=153,
-['SortId']=4,
+['SortId']=5,
 ['GoodsPic']='',
 },
 [90014]={
@@ -3854,7 +3863,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=850,
 ['PayForType']=153,
-['SortId']=5,
+['SortId']=6,
 ['GoodsPic']='',
 },
 [90015]={
@@ -3863,7 +3872,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=15037,
 ['PayForType']=153,
-['SortId']=7,
+['SortId']=8,
 ['GoodsPic']='',
 },
 [90016]={
@@ -3872,7 +3881,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=15038,
 ['PayForType']=153,
-['SortId']=8,
+['SortId']=9,
 ['GoodsPic']='',
 },
 [90017]={
@@ -3881,7 +3890,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=15039,
 ['PayForType']=153,
-['SortId']=9,
+['SortId']=10,
 ['GoodsPic']='',
 },
 [90018]={
@@ -3890,7 +3899,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=11102,
 ['PayForType']=153,
-['SortId']=10,
+['SortId']=11,
 ['GoodsPic']='',
 },
 [90019]={
@@ -3899,7 +3908,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=11105,
 ['PayForType']=153,
-['SortId']=11,
+['SortId']=12,
 ['GoodsPic']='',
 },
 [90020]={
@@ -3908,7 +3917,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=11104,
 ['PayForType']=153,
-['SortId']=12,
+['SortId']=13,
 ['GoodsPic']='',
 },
 [90021]={
@@ -3917,7 +3926,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=15097,
 ['PayForType']=153,
-['SortId']=13,
+['SortId']=14,
 ['GoodsPic']='',
 },
 [90022]={
@@ -3926,7 +3935,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=15058,
 ['PayForType']=153,
-['SortId']=14,
+['SortId']=15,
 ['GoodsPic']='',
 },
 [90023]={
@@ -3935,7 +3944,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=15066,
 ['PayForType']=153,
-['SortId']=15,
+['SortId']=16,
 ['GoodsPic']='',
 },
 [90024]={
@@ -3944,7 +3953,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=12198,
 ['PayForType']=153,
-['SortId']=17,
+['SortId']=18,
 ['GoodsPic']='',
 },
 [90025]={
@@ -3953,7 +3962,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=12195,
 ['PayForType']=153,
-['SortId']=19,
+['SortId']=20,
 ['GoodsPic']='',
 },
 [90026]={
@@ -3962,7 +3971,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=12194,
 ['PayForType']=153,
-['SortId']=20,
+['SortId']=21,
 ['GoodsPic']='',
 },
 [90027]={
@@ -3971,7 +3980,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=12193,
 ['PayForType']=153,
-['SortId']=21,
+['SortId']=22,
 ['GoodsPic']='',
 },
 [90028]={
@@ -3980,7 +3989,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=12163,
 ['PayForType']=153,
-['SortId']=22,
+['SortId']=23,
 ['GoodsPic']='',
 },
 [90029]={
@@ -3989,7 +3998,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=12186,
 ['PayForType']=153,
-['SortId']=23,
+['SortId']=24,
 ['GoodsPic']='',
 },
 [90030]={
@@ -3998,7 +4007,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=12197,
 ['PayForType']=153,
-['SortId']=24,
+['SortId']=25,
 ['GoodsPic']='',
 },
 [90031]={
@@ -4007,7 +4016,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=12196,
 ['PayForType']=153,
-['SortId']=25,
+['SortId']=26,
 ['GoodsPic']='',
 },
 [90032]={
@@ -4016,7 +4025,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=523,
 ['PayForType']=153,
-['SortId']=26,
+['SortId']=27,
 ['GoodsPic']='',
 },
 [90033]={
@@ -4025,7 +4034,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=261,
 ['PayForType']=153,
-['SortId']=27,
+['SortId']=28,
 ['GoodsPic']='',
 },
 [90034]={
@@ -4034,7 +4043,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=364,
 ['PayForType']=153,
-['SortId']=28,
+['SortId']=29,
 ['GoodsPic']='',
 },
 [90035]={
@@ -4043,7 +4052,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=690,
 ['PayForType']=153,
-['SortId']=29,
+['SortId']=30,
 ['GoodsPic']='',
 },
 [90036]={
@@ -4052,7 +4061,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=704,
 ['PayForType']=153,
-['SortId']=30,
+['SortId']=31,
 ['GoodsPic']='',
 },
 [90037]={
@@ -4061,7 +4070,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=100,
 ['PayForType']=153,
-['SortId']=32,
+['SortId']=33,
 ['GoodsPic']='',
 },
 [90038]={
@@ -4070,34 +4079,16 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=110,
 ['PayForType']=153,
-['SortId']=33,
-['GoodsPic']='',
-},
-[90039]={
-['GoodsId']=90039,
-['GoodsName']='天使之泪10个',
-['GoodsDesc']='',
-['GoodsItem']=100,
-['PayForType']=153,
 ['SortId']=34,
 ['GoodsPic']='',
 },
-[90040]={
-['GoodsId']=90040,
-['GoodsName']='命运绳结10个',
-['GoodsDesc']='',
-['GoodsItem']=110,
-['PayForType']=153,
-['SortId']=35,
-['GoodsPic']='',
-},
 [90041]={
 ['GoodsId']=90041,
 ['GoodsName']='MVP自選卡',
 ['GoodsDesc']='',
 ['GoodsItem']=520,
 ['PayForType']=153,
-['SortId']=36,
+['SortId']=35,
 ['GoodsPic']='',
 },
 [90042]={
@@ -4106,7 +4097,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=513,
 ['PayForType']=153,
-['SortId']=37,
+['SortId']=36,
 ['GoodsPic']='',
 },
 [90043]={
@@ -4115,7 +4106,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=268,
 ['PayForType']=153,
-['SortId']=38,
+['SortId']=37,
 ['GoodsPic']='',
 },
 [90044]={
@@ -4124,7 +4115,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=128,
 ['PayForType']=153,
-['SortId']=39,
+['SortId']=38,
 ['GoodsPic']='',
 },
 [90045]={
@@ -4133,7 +4124,7 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=130,
 ['PayForType']=153,
-['SortId']=40,
+['SortId']=39,
 ['GoodsPic']='',
 },
 [90046]={
@@ -4142,9 +4133,10 @@ local ShopCfg = {
 ['GoodsDesc']='',
 ['GoodsItem']=131,
 ['PayForType']=153,
-['SortId']=41,
+['SortId']=40,
 ['GoodsPic']='',
-},[100001]={
+},
+[100001]={
 ['GoodsId']=100001,
 ['GoodsName']='寵物-俄賽里斯',
 ['GoodsDesc']='特性1:單體超強傷害\n特性2:詛咒目標使其無法獲得增益狀態\n特性3:攻擊時概率施加毒咒,造成巨量持續掉血',

+ 5 - 5
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

+ 1 - 1
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;BUGLY;FPS_DISABLE