元宵配置

Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -57,9 +57,9 @@ public class CheckHotUpdateRes : EditorWindow
 #if UNITY_IOS
         info.VersionFileName = "afivs";
         info.mainfestFileName = "afimft";
-#else
-            versionFileName = "Version";
-            assetsFileName = "mainfest";
+//#else
+//        versionFileName = "Version";
+//        assetsFileName = "mainfest";
 #endif
         needResList = new List<VersionInfoData>();
     }

Assets/Lua/Config/ActivitiesCfg.lua

@@ -2084,6 +2084,20 @@ local ActivitiesCfg = {
 ['RuleKey']='',
 ['ExpiredActivities']=0,
 },
+[18004]={
+['Id']=18004,
+['Type']=12,
+['Name']='元宵儲值',
+['Order']=1,
+['BG']='ActivityImg/monthrecharge_cn',
+['ActivityBG']='ActivityImg/monthrecharge_cn',
+['PageId']=335,
+['Entrance']={159},
+['NeedShow']=true,
+['NoPay']=true,
+['RuleKey']='',
+['ExpiredActivities']=0,
+},
 [144]={
 ['Id']=144,
 ['Type']=12,

Assets/Lua/Config/ActivitiesCollectionCfg.lua

@@ -164,7 +164,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=17,
 ['Name']='元宵活動',
 ['Order']=1,
-['ExchangeCondition']={{166,15}},
+['ExchangeCondition']={{166,288}},
 ['ServersReward']=0,
 ['Number']=10,
 ['Reward']={{15024,1}},
@@ -893,5 +893,545 @@ local ActivitiesCollectionCfg = {
 ['Reward']={{116,10}},
 ['ActivitiesId']=20031,
 },
+[100]={
+['Id']=100,
+['Name']='元宵活動',
+['Order']=5,
+['ExchangeCondition']={{166,249}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{613,1}},
+['ActivitiesId']=10,
+},
+[101]={
+['Id']=101,
+['Name']='元宵活動',
+['Order']=6,
+['ExchangeCondition']={{166,249}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13101,1}},
+['ActivitiesId']=10,
+},
+[102]={
+['Id']=102,
+['Name']='元宵活動',
+['Order']=7,
+['ExchangeCondition']={{166,249}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13150,1}},
+['ActivitiesId']=10,
+},
+[103]={
+['Id']=103,
+['Name']='元宵活動',
+['Order']=8,
+['ExchangeCondition']={{166,249}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13123,1}},
+['ActivitiesId']=10,
+},
+[104]={
+['Id']=104,
+['Name']='元宵活動',
+['Order']=9,
+['ExchangeCondition']={{166,249}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13124,1}},
+['ActivitiesId']=10,
+},
+[105]={
+['Id']=105,
+['Name']='元宵活動',
+['Order']=10,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13153,1}},
+['ActivitiesId']=10,
+},
+[106]={
+['Id']=106,
+['Name']='元宵活動',
+['Order']=11,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13154,1}},
+['ActivitiesId']=10,
+},
+[107]={
+['Id']=107,
+['Name']='元宵活動',
+['Order']=12,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13086,1}},
+['ActivitiesId']=10,
+},
+[108]={
+['Id']=108,
+['Name']='元宵活動',
+['Order']=13,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13085,1}},
+['ActivitiesId']=10,
+},
+[109]={
+['Id']=109,
+['Name']='元宵活動',
+['Order']=14,
+['ExchangeCondition']={{166,166}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{15037,1}},
+['ActivitiesId']=10,
+},
+[110]={
+['Id']=110,
+['Name']='元宵活動',
+['Order']=15,
+['ExchangeCondition']={{166,166}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{15038,1}},
+['ActivitiesId']=10,
+},
+[111]={
+['Id']=111,
+['Name']='元宵活動',
+['Order']=16,
+['ExchangeCondition']={{166,166}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{15039,1}},
+['ActivitiesId']=10,
+},
+[112]={
+['Id']=112,
+['Name']='元宵活動',
+['Order']=17,
+['ExchangeCondition']={{166,166}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13034,1}},
+['ActivitiesId']=10,
+},
+[113]={
+['Id']=113,
+['Name']='元宵活動',
+['Order']=18,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13097,1}},
+['ActivitiesId']=10,
+},
+[114]={
+['Id']=114,
+['Name']='元宵活動',
+['Order']=19,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13112,1}},
+['ActivitiesId']=10,
+},
+[115]={
+['Id']=115,
+['Name']='元宵活動',
+['Order']=20,
+['ExchangeCondition']={{166,166}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{526,1}},
+['ActivitiesId']=10,
+},
+[116]={
+['Id']=116,
+['Name']='元宵活動',
+['Order']=21,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{11102,1}},
+['ActivitiesId']=10,
+},
+[117]={
+['Id']=117,
+['Name']='元宵活動',
+['Order']=22,
+['ExchangeCondition']={{166,150}},
+['ServersReward']=0,
+['Number']=30,
+['Reward']={{851,1}},
+['ActivitiesId']=10,
+},
+[118]={
+['Id']=118,
+['Name']='元宵活動',
+['Order']=23,
+['ExchangeCondition']={{166,88}},
+['ServersReward']=0,
+['Number']=30,
+['Reward']={{15035,1}},
+['ActivitiesId']=10,
+},
+[119]={
+['Id']=119,
+['Name']='元宵活動',
+['Order']=24,
+['ExchangeCondition']={{166,120}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{846,1}},
+['ActivitiesId']=10,
+},
+[120]={
+['Id']=120,
+['Name']='元宵活動',
+['Order']=25,
+['ExchangeCondition']={{166,120}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{854,1}},
+['ActivitiesId']=10,
+},
+[121]={
+['Id']=121,
+['Name']='元宵活動',
+['Order']=26,
+['ExchangeCondition']={{166,120}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{856,1}},
+['ActivitiesId']=10,
+},
+[122]={
+['Id']=122,
+['Name']='元宵活動',
+['Order']=27,
+['ExchangeCondition']={{166,120}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{857,1}},
+['ActivitiesId']=10,
+},
+[123]={
+['Id']=123,
+['Name']='元宵活動',
+['Order']=28,
+['ExchangeCondition']={{166,120}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{858,1}},
+['ActivitiesId']=10,
+},
+[124]={
+['Id']=124,
+['Name']='元宵活動',
+['Order']=29,
+['ExchangeCondition']={{166,60}},
+['ServersReward']=0,
+['Number']=30,
+['Reward']={{20007,1}},
+['ActivitiesId']=10,
+},
+[125]={
+['Id']=125,
+['Name']='元宵活動',
+['Order']=30,
+['ExchangeCondition']={{166,60}},
+['ServersReward']=0,
+['Number']=30,
+['Reward']={{20008,1}},
+['ActivitiesId']=10,
+},
+[126]={
+['Id']=126,
+['Name']='元宵活動',
+['Order']=31,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{340,1}},
+['ActivitiesId']=10,
+},
+[127]={
+['Id']=127,
+['Name']='元宵活動',
+['Order']=32,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{341,1}},
+['ActivitiesId']=10,
+},
+[128]={
+['Id']=128,
+['Name']='元宵活動',
+['Order']=33,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{342,1}},
+['ActivitiesId']=10,
+},
+[129]={
+['Id']=129,
+['Name']='元宵活動',
+['Order']=34,
+['ExchangeCondition']={{166,188}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{343,1}},
+['ActivitiesId']=10,
+},
+[130]={
+['Id']=130,
+['Name']='元宵活動',
+['Order']=35,
+['ExchangeCondition']={{166,88}},
+['ServersReward']=0,
+['Number']=30,
+['Reward']={{855,1}},
+['ActivitiesId']=10,
+},
+[131]={
+['Id']=131,
+['Name']='元宵活動',
+['Order']=36,
+['ExchangeCondition']={{166,120}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{12198,1}},
+['ActivitiesId']=10,
+},
+[132]={
+['Id']=132,
+['Name']='元宵活動',
+['Order']=37,
+['ExchangeCondition']={{166,25}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12191,1}},
+['ActivitiesId']=10,
+},
+[133]={
+['Id']=133,
+['Name']='元宵活動',
+['Order']=38,
+['ExchangeCondition']={{166,25}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12195,1}},
+['ActivitiesId']=10,
+},
+[134]={
+['Id']=134,
+['Name']='元宵活動',
+['Order']=39,
+['ExchangeCondition']={{166,25}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12194,1}},
+['ActivitiesId']=10,
+},
+[135]={
+['Id']=135,
+['Name']='元宵活動',
+['Order']=40,
+['ExchangeCondition']={{166,25}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12193,1}},
+['ActivitiesId']=10,
+},
+[136]={
+['Id']=136,
+['Name']='元宵活動',
+['Order']=41,
+['ExchangeCondition']={{166,25}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12163,1}},
+['ActivitiesId']=10,
+},
+[137]={
+['Id']=137,
+['Name']='元宵活動',
+['Order']=42,
+['ExchangeCondition']={{166,25}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12186,1}},
+['ActivitiesId']=10,
+},
+[138]={
+['Id']=138,
+['Name']='元宵活動',
+['Order']=43,
+['ExchangeCondition']={{166,25}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12197,1}},
+['ActivitiesId']=10,
+},
+[139]={
+['Id']=139,
+['Name']='元宵活動',
+['Order']=44,
+['ExchangeCondition']={{166,25}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12196,1}},
+['ActivitiesId']=10,
+},
+[140]={
+['Id']=140,
+['Name']='元宵活動',
+['Order']=45,
+['ExchangeCondition']={{166,15}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{264,1}},
+['ActivitiesId']=10,
+},
+[141]={
+['Id']=141,
+['Name']='元宵活動',
+['Order']=46,
+['ExchangeCondition']={{166,20}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{261,1}},
+['ActivitiesId']=10,
+},
+[142]={
+['Id']=142,
+['Name']='元宵活動',
+['Order']=47,
+['ExchangeCondition']={{166,1}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{140,1}},
+['ActivitiesId']=10,
+},
+[143]={
+['Id']=143,
+['Name']='元宵活動',
+['Order']=48,
+['ExchangeCondition']={{166,20}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{237,1}},
+['ActivitiesId']=10,
+},
+[144]={
+['Id']=144,
+['Name']='元宵活動',
+['Order']=49,
+['ExchangeCondition']={{166,1}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{100,1}},
+['ActivitiesId']=10,
+},
+[145]={
+['Id']=145,
+['Name']='元宵活動',
+['Order']=50,
+['ExchangeCondition']={{166,2}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{110,1}},
+['ActivitiesId']=10,
+},
+[146]={
+['Id']=146,
+['Name']='元宵活動',
+['Order']=51,
+['ExchangeCondition']={{166,8}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{268,1}},
+['ActivitiesId']=10,
+},
+[147]={
+['Id']=147,
+['Name']='元宵活動',
+['Order']=52,
+['ExchangeCondition']={{166,20}},
+['ServersReward']=0,
+['Number']=30,
+['Reward']={{520,1}},
+['ActivitiesId']=10,
+},
+[148]={
+['Id']=148,
+['Name']='元宵活動',
+['Order']=53,
+['ExchangeCondition']={{166,30}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{690,1}},
+['ActivitiesId']=10,
+},
+[149]={
+['Id']=149,
+['Name']='元宵活動',
+['Order']=54,
+['ExchangeCondition']={{166,30}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{704,1}},
+['ActivitiesId']=10,
+},
+[150]={
+['Id']=150,
+['Name']='元宵活動',
+['Order']=55,
+['ExchangeCondition']={{166,2}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{128,1}},
+['ActivitiesId']=10,
+},
+[151]={
+['Id']=151,
+['Name']='元宵活動',
+['Order']=56,
+['ExchangeCondition']={{166,2}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{130,1}},
+['ActivitiesId']=10,
+},
+[152]={
+['Id']=152,
+['Name']='元宵活動',
+['Order']=57,
+['ExchangeCondition']={{166,2}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{131,1}},
+['ActivitiesId']=10,
+},
+[153]={
+['Id']=153,
+['Name']='元宵活動',
+['Order']=58,
+['ExchangeCondition']={{166,9}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{513,1}},
+['ActivitiesId']=10,
+},
 }
 return ActivitiesCollectionCfg

Assets/Lua/Config/ActivitiesTaskCfg.lua

@@ -8355,5 +8355,135 @@ local ActivitiesTaskCfg = {
     ['ShowState']=1,
     ['Integral']=0,
     },
+    [20100]={
+    ['TaskId']=20100,
+    ['TaskCondition']={{60,1.99}},
+    ['Reward']={{166,5},{2,200000}},
+    ['Title']='活動期間累計儲值1.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20101]={
+    ['TaskId']=20101,
+    ['TaskCondition']={{60,9.99}},
+    ['Reward']={{166,25},{2,500000}},
+    ['Title']='活動期間累計儲值9.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20102]={
+    ['TaskId']=20102,
+    ['TaskCondition']={{60,19.99}},
+    ['Reward']={{166,30},{2,600000}},
+    ['Title']='活動期間累計儲值19.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20103]={
+    ['TaskId']=20103,
+    ['TaskCondition']={{60,39.99}},
+    ['Reward']={{166,65},{2,800000}},
+    ['Title']='活動期間累計儲值39.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20104]={
+    ['TaskId']=20104,
+    ['TaskCondition']={{60,69.99}},
+    ['Reward']={{166,90},{2,1000000}},
+    ['Title']='活動期間累計儲值69.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20105]={
+    ['TaskId']=20105,
+    ['TaskCondition']={{60,99.99}},
+    ['Reward']={{166,120},{2,1500000}},
+    ['Title']='活動期間累計儲值99.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20106]={
+    ['TaskId']=20106,
+    ['TaskCondition']={{60,149.99}},
+    ['Reward']={{166,150},{2,2000000}},
+    ['Title']='活動期間累計儲值149.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20107]={
+    ['TaskId']=20107,
+    ['TaskCondition']={{60,199.99}},
+    ['Reward']={{166,200},{2,2500000}},
+    ['Title']='活動期間累計儲值199.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20108]={
+    ['TaskId']=20108,
+    ['TaskCondition']={{60,249.99}},
+    ['Reward']={{166,270},{2,3000000}},
+    ['Title']='活動期間累計儲值249.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20109]={
+    ['TaskId']=20109,
+    ['TaskCondition']={{60,299.99}},
+    ['Reward']={{166,350},{2,4000000}},
+    ['Title']='活動期間累計儲值299.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20110]={
+    ['TaskId']=20110,
+    ['TaskCondition']={{60,349.99}},
+    ['Reward']={{166,450},{2,5000000}},
+    ['Title']='活動期間累計儲值349.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20111]={
+    ['TaskId']=20111,
+    ['TaskCondition']={{60,399.99}},
+    ['Reward']={{166,500},{2,5000000}},
+    ['Title']='活動期間累計儲值399.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20112]={
+    ['TaskId']=20112,
+    ['TaskCondition']={{60,499.99}},
+    ['Reward']={{166,600},{2,5000000}},
+    ['Title']='活動期間累計儲值499.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
     }
     return ActivitiesTaskCfg

Assets/Lua/Config/ShopCfg.lua

@@ -536,6 +536,15 @@ local ShopCfg = {
     ['SortId']=23,
     ['GoodsPic']='',
     },
+[10060]={
+['GoodsId']=10060,
+['GoodsName']='如意燈',
+['GoodsDesc']='',
+['GoodsItem']=166,
+['PayForType']=54,
+['SortId']=1,
+['GoodsPic']='',
+},
 [20001]={
 ['GoodsId']=20001,
 ['GoodsName']='鋁',

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

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