123 1 rok temu
rodzic
commit
a940660090

BIN
Assets/Content/Raw_Art/UI/UILanuch/img_logo_01.png


+ 15 - 0
Assets/Lua/Config/ActivitiesCfg.lua

@@ -2311,6 +2311,21 @@ local ActivitiesCfg = {
 ['RuleKey']='SetsWordActivityText',
 ['ExpiredActivities']=0,
 },
+[15002]={
+['Id']=15002,
+['Type']=7,
+['Name']='踏青兑換',
+['Order']=1,
+['BG']='ActivityImg/active_icon_taqinhaoli',
+['ActivityBG']='ActivityImg/active_icon_taqinhaoli',
+['PageId']=365,
+['Entrance']={159},
+['HdDrop']={178,179,180,181,182,184,185,186,187,188,189},
+['NeedShow']=true,
+['NoPay']=false,
+['RuleKey']='SetsWordActivityText',
+['ExpiredActivities']=0,
+},
 [20001]={
 ['Id']=20001,
 ['Type']=7,

+ 590 - 0
Assets/Lua/Config/ActivitiesCollectionCfg.lua

@@ -2023,5 +2023,595 @@ local ActivitiesCollectionCfg = {
 ['Reward']={{513,1}},
 ['ActivitiesId']=15001,
 },
+[213]={
+['Id']=213,
+['Name']='植树节兑换',
+['Order']=1,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{15067,1}},
+['ActivitiesId']=15002,
+},
+[214]={
+['Id']=214,
+['Name']='植树节兑换',
+['Order']=2,
+['ExchangeCondition']={{183,488}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{15077,1}},
+['ActivitiesId']=15002,
+},
+[215]={
+['Id']=215,
+['Name']='植树节兑换',
+['Order']=3,
+['ExchangeCondition']={{183,688}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{15087,1}},
+['ActivitiesId']=15002,
+},
+[216]={
+['Id']=216,
+['Name']='植树节兑换',
+['Order']=4,
+['ExchangeCondition']={{183,488}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{693,1}},
+['ActivitiesId']=15002,
+},
+[217]={
+['Id']=217,
+['Name']='植树节兑换',
+['Order']=5,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{707,1}},
+['ActivitiesId']=15002,
+},
+[218]={
+['Id']=218,
+['Name']='植树节兑换',
+['Order']=6,
+['ExchangeCondition']={{183,688}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13183,1}},
+['ActivitiesId']=15002,
+},
+[219]={
+['Id']=219,
+['Name']='植树节兑换',
+['Order']=7,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13148,1}},
+['ActivitiesId']=15002,
+},
+[220]={
+['Id']=220,
+['Name']='植树节兑换',
+['Order']=8,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13190,1}},
+['ActivitiesId']=15002,
+},
+[221]={
+['Id']=221,
+['Name']='植树节兑换',
+['Order']=9,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13194,1}},
+['ActivitiesId']=15002,
+},
+[222]={
+['Id']=222,
+['Name']='植树节兑换',
+['Order']=10,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13195,1}},
+['ActivitiesId']=15002,
+},
+[223]={
+['Id']=223,
+['Name']='植树节兑换',
+['Order']=11,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13120,1}},
+['ActivitiesId']=15002,
+},
+[224]={
+['Id']=224,
+['Name']='植树节兑换',
+['Order']=12,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13105,1}},
+['ActivitiesId']=15002,
+},
+[225]={
+['Id']=225,
+['Name']='植树节兑换',
+['Order']=13,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13110,1}},
+['ActivitiesId']=15002,
+},
+[226]={
+['Id']=226,
+['Name']='植树节兑换',
+['Order']=14,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13009,1}},
+['ActivitiesId']=15002,
+},
+[227]={
+['Id']=227,
+['Name']='植树节兑换',
+['Order']=15,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13192,1}},
+['ActivitiesId']=15002,
+},
+[228]={
+['Id']=228,
+['Name']='植树节兑换',
+['Order']=16,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13193,1}},
+['ActivitiesId']=15002,
+},
+[229]={
+['Id']=229,
+['Name']='植树节兑换',
+['Order']=17,
+['ExchangeCondition']={{183,488}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{526,1}},
+['ActivitiesId']=15002,
+},
+[230]={
+['Id']=230,
+['Name']='植树节兑换',
+['Order']=18,
+['ExchangeCondition']={{183,488}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{11102,1}},
+['ActivitiesId']=15002,
+},
+[231]={
+['Id']=231,
+['Name']='植树节兑换',
+['Order']=19,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{851,1}},
+['ActivitiesId']=15002,
+},
+[232]={
+['Id']=232,
+['Name']='植树节兑换',
+['Order']=20,
+['ExchangeCondition']={{183,250}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{15035,1}},
+['ActivitiesId']=15002,
+},
+[233]={
+['Id']=233,
+['Name']='植树节兑换',
+['Order']=21,
+['ExchangeCondition']={{183,250}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{11567,1}},
+['ActivitiesId']=15002,
+},
+[234]={
+['Id']=234,
+['Name']='植树节兑换',
+['Order']=22,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{846,1}},
+['ActivitiesId']=15002,
+},
+[235]={
+['Id']=235,
+['Name']='植树节兑换',
+['Order']=23,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{854,1}},
+['ActivitiesId']=15002,
+},
+[236]={
+['Id']=236,
+['Name']='植树节兑换',
+['Order']=24,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{856,1}},
+['ActivitiesId']=15002,
+},
+[237]={
+['Id']=237,
+['Name']='植树节兑换',
+['Order']=25,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{857,1}},
+['ActivitiesId']=15002,
+},
+[238]={
+['Id']=238,
+['Name']='植树节兑换',
+['Order']=26,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{858,1}},
+['ActivitiesId']=15002,
+},
+[239]={
+['Id']=239,
+['Name']='植树节兑换',
+['Order']=27,
+['ExchangeCondition']={{183,120}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{20007,1}},
+['ActivitiesId']=15002,
+},
+[240]={
+['Id']=240,
+['Name']='植树节兑换',
+['Order']=28,
+['ExchangeCondition']={{183,120}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{20008,1}},
+['ActivitiesId']=15002,
+},
+[241]={
+['Id']=241,
+['Name']='植树节兑换',
+['Order']=29,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{332,1}},
+['ActivitiesId']=15002,
+},
+[242]={
+['Id']=242,
+['Name']='植树节兑换',
+['Order']=30,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{333,1}},
+['ActivitiesId']=15002,
+},
+[243]={
+['Id']=243,
+['Name']='植树节兑换',
+['Order']=31,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{334,1}},
+['ActivitiesId']=15002,
+},
+[244]={
+['Id']=244,
+['Name']='植树节兑换',
+['Order']=32,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{335,1}},
+['ActivitiesId']=15002,
+},
+[245]={
+['Id']=245,
+['Name']='植树节兑换',
+['Order']=33,
+['ExchangeCondition']={{183,188}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{855,1}},
+['ActivitiesId']=15002,
+},
+[246]={
+['Id']=246,
+['Name']='植树节兑换',
+['Order']=34,
+['ExchangeCondition']={{183,150}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12198,1}},
+['ActivitiesId']=15002,
+},
+[247]={
+['Id']=247,
+['Name']='植树节兑换',
+['Order']=35,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12191,1}},
+['ActivitiesId']=15002,
+},
+[248]={
+['Id']=248,
+['Name']='植树节兑换',
+['Order']=36,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12195,1}},
+['ActivitiesId']=15002,
+},
+[249]={
+['Id']=249,
+['Name']='植树节兑换',
+['Order']=37,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12194,1}},
+['ActivitiesId']=15002,
+},
+[250]={
+['Id']=250,
+['Name']='植树节兑换',
+['Order']=38,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12193,1}},
+['ActivitiesId']=15002,
+},
+[251]={
+['Id']=251,
+['Name']='植树节兑换',
+['Order']=39,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12163,1}},
+['ActivitiesId']=15002,
+},
+[252]={
+['Id']=252,
+['Name']='植树节兑换',
+['Order']=40,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12186,1}},
+['ActivitiesId']=15002,
+},
+[253]={
+['Id']=253,
+['Name']='植树节兑换',
+['Order']=41,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12197,1}},
+['ActivitiesId']=15002,
+},
+[254]={
+['Id']=254,
+['Name']='植树节兑换',
+['Order']=42,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12196,1}},
+['ActivitiesId']=15002,
+},
+[255]={
+['Id']=255,
+['Name']='植树节兑换',
+['Order']=43,
+['ExchangeCondition']={{183,30}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{264,1}},
+['ActivitiesId']=15002,
+},
+[256]={
+['Id']=256,
+['Name']='植树节兑换',
+['Order']=44,
+['ExchangeCondition']={{183,30}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{261,1}},
+['ActivitiesId']=15002,
+},
+[257]={
+['Id']=257,
+['Name']='植树节兑换',
+['Order']=45,
+['ExchangeCondition']={{183,1}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{140,1}},
+['ActivitiesId']=15002,
+},
+[258]={
+['Id']=258,
+['Name']='植树节兑换',
+['Order']=46,
+['ExchangeCondition']={{183,30}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{237,1}},
+['ActivitiesId']=15002,
+},
+[259]={
+['Id']=259,
+['Name']='植树节兑换',
+['Order']=47,
+['ExchangeCondition']={{183,15}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{200,1}},
+['ActivitiesId']=15002,
+},
+[260]={
+['Id']=260,
+['Name']='植树节兑换',
+['Order']=48,
+['ExchangeCondition']={{183,88}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{529,1}},
+['ActivitiesId']=15002,
+},
+[261]={
+['Id']=261,
+['Name']='植树节兑换',
+['Order']=49,
+['ExchangeCondition']={{183,10}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{528,1}},
+['ActivitiesId']=15002,
+},
+[262]={
+['Id']=262,
+['Name']='植树节兑换',
+['Order']=50,
+['ExchangeCondition']={{183,1}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{100,1}},
+['ActivitiesId']=15002,
+},
+[263]={
+['Id']=263,
+['Name']='植树节兑换',
+['Order']=51,
+['ExchangeCondition']={{183,2}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{110,1}},
+['ActivitiesId']=15002,
+},
+[264]={
+['Id']=264,
+['Name']='植树节兑换',
+['Order']=52,
+['ExchangeCondition']={{183,15}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{268,1}},
+['ActivitiesId']=15002,
+},
+[265]={
+['Id']=265,
+['Name']='植树节兑换',
+['Order']=53,
+['ExchangeCondition']={{183,40}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{520,1}},
+['ActivitiesId']=15002,
+},
+[266]={
+['Id']=266,
+['Name']='植树节兑换',
+['Order']=54,
+['ExchangeCondition']={{183,55}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{690,1}},
+['ActivitiesId']=15002,
+},
+[267]={
+['Id']=267,
+['Name']='植树节兑换',
+['Order']=55,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{704,1}},
+['ActivitiesId']=15002,
+},
+[268]={
+['Id']=268,
+['Name']='植树节兑换',
+['Order']=56,
+['ExchangeCondition']={{183,8}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{128,1}},
+['ActivitiesId']=15002,
+},
+[269]={
+['Id']=269,
+['Name']='植树节兑换',
+['Order']=57,
+['ExchangeCondition']={{183,5}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{130,1}},
+['ActivitiesId']=15002,
+},
+[270]={
+['Id']=270,
+['Name']='植树节兑换',
+['Order']=58,
+['ExchangeCondition']={{183,5}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{131,1}},
+['ActivitiesId']=15002,
+},
+[271]={
+['Id']=271,
+['Name']='植树节兑换',
+['Order']=59,
+['ExchangeCondition']={{183,30}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{513,1}},
+['ActivitiesId']=15002,
+},
 }
 return ActivitiesCollectionCfg

+ 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//serverlist2',
+	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
Assets/Lua/Logic/Activities/ActivitiesDataMgr.lua

@@ -181,7 +181,7 @@ function ActivitiesDataMgr:OnActivitiesOpenListNtf(data)
 end
 
 function ActivitiesDataMgr:OnActivitiesChangeNtf(data)
-    --LogError("=====OnActivitiesChangeNtf========"..Inspect(data));
+   -- LogError("=====OnActivitiesChangeNtf========"..Inspect(data));
     self:RefreshActivitiesData(data.activity_data_list,data.cur_day_end_time)
     self:RefreshDayEndTime(data.cur_day_end_time)
     self:RefreshRedPointState()

+ 4 - 4
ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: WentingTec
-  productName: "\u5FC3\u529B\u7269\u8BED"
+  productName: "\u521D\u5FC3\u8005\u5927\u5192\u96AA"
   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: 1.0.0.6
+  bundleVersion: 0.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -846,10 +846,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;GAME_DEBUG
+    Android: USE_LUA;VUPLEX_CCU
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU
+    iPhone: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1