配置

Assets/Content/Icons/ActivityImg/active_icon_taqinhaoli.png.meta

@@ -86,7 +86,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -98,7 +98,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -122,7 +122,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:

Assets/Content/Icons/ActivityImg/active_icon_taqinqiandao.png.meta

@@ -86,7 +86,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -98,7 +98,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -122,7 +122,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:

Assets/Content/Icons/Items/icon_luomituanzi.png.meta

@@ -139,7 +139,7 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  spritePackingTag: ItemIcons_1024_8
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 

Assets/Content/Raw_Art/UI/Items/icon_luomituanzi.png.meta

@@ -86,7 +86,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -98,7 +98,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -122,7 +122,7 @@ TextureImporter:
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -139,7 +139,7 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  spritePackingTag: ItemIcons_1024_8
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 

Assets/Lua/Config/ActivitiesCfg.lua

@@ -182,7 +182,7 @@ local ActivitiesCfg = {
 ['Type']=4,
 ['Name']='踏青登錄',
 ['Order']=13,
-['BG']='ActivityImg/arborday_cn',
+['BG']='ActivityImg/active_icon_taqinqiandao',
 ['ActivityBG']='ActivityImg/active_icon_taqinqiandao',
 ['PageId']=304,
 ['Entrance']={159},

Assets/Lua/Config/ActivitiesCollectionCfg.lua

@@ -1437,9 +1437,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=154,
 ['Name']='植树节兑换',
 ['Order']=1,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,688}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=2,
 ['Reward']={{15067,1}},
 ['ActivitiesId']=15001,
 },
@@ -1447,9 +1447,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=155,
 ['Name']='植树节兑换',
 ['Order']=2,
-['ExchangeCondition']={{183,488}},
+['ExchangeCondition']={{183,688}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=2,
 ['Reward']={{15077,1}},
 ['ActivitiesId']=15001,
 },
@@ -1459,7 +1459,7 @@ local ActivitiesCollectionCfg = {
 ['Order']=3,
 ['ExchangeCondition']={{183,688}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=2,
 ['Reward']={{15087,1}},
 ['ActivitiesId']=15001,
 },
@@ -1467,9 +1467,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=157,
 ['Name']='植树节兑换',
 ['Order']=4,
-['ExchangeCondition']={{183,488}},
+['ExchangeCondition']={{183,788}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{693,1}},
 ['ActivitiesId']=15001,
 },
@@ -1477,9 +1477,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=158,
 ['Name']='植树节兑换',
 ['Order']=5,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,588}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{707,1}},
 ['ActivitiesId']=15001,
 },
@@ -1517,7 +1517,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=162,
 ['Name']='植树节兑换',
 ['Order']=9,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,688}},
 ['ServersReward']=0,
 ['Number']=1,
 ['Reward']={{13194,1}},
@@ -1527,7 +1527,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=163,
 ['Name']='植树节兑换',
 ['Order']=10,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,688}},
 ['ServersReward']=0,
 ['Number']=1,
 ['Reward']={{13195,1}},
@@ -1537,7 +1537,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=164,
 ['Name']='植树节兑换',
 ['Order']=11,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,188}},
 ['ServersReward']=0,
 ['Number']=1,
 ['Reward']={{13120,1}},
@@ -1547,7 +1547,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=165,
 ['Name']='植树节兑换',
 ['Order']=12,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,188}},
 ['ServersReward']=0,
 ['Number']=1,
 ['Reward']={{13105,1}},
@@ -1557,7 +1557,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=166,
 ['Name']='植树节兑换',
 ['Order']=13,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,188}},
 ['ServersReward']=0,
 ['Number']=1,
 ['Reward']={{13110,1}},
@@ -1567,7 +1567,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=167,
 ['Name']='植树节兑换',
 ['Order']=14,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
 ['Number']=1,
 ['Reward']={{13009,1}},
@@ -1607,7 +1607,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=171,
 ['Name']='植树节兑换',
 ['Order']=18,
-['ExchangeCondition']={{183,488}},
+['ExchangeCondition']={{183,688}},
 ['ServersReward']=0,
 ['Number']=1,
 ['Reward']={{11102,1}},
@@ -1617,9 +1617,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=172,
 ['Name']='植树节兑换',
 ['Order']=19,
-['ExchangeCondition']={{183,388}},
+['ExchangeCondition']={{183,1288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{851,1}},
 ['ActivitiesId']=15001,
 },
@@ -1627,9 +1627,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=173,
 ['Name']='植树节兑换',
 ['Order']=20,
-['ExchangeCondition']={{183,250}},
+['ExchangeCondition']={{183,688}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{15035,1}},
 ['ActivitiesId']=15001,
 },
@@ -1637,9 +1637,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=174,
 ['Name']='植树节兑换',
 ['Order']=21,
-['ExchangeCondition']={{183,250}},
+['ExchangeCondition']={{183,450}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{11567,1}},
 ['ActivitiesId']=15001,
 },
@@ -1647,9 +1647,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=175,
 ['Name']='植树节兑换',
 ['Order']=22,
-['ExchangeCondition']={{183,288}},
+['ExchangeCondition']={{183,688}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{846,1}},
 ['ActivitiesId']=15001,
 },
@@ -1657,9 +1657,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=176,
 ['Name']='植树节兑换',
 ['Order']=23,
-['ExchangeCondition']={{183,288}},
+['ExchangeCondition']={{183,1288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{854,1}},
 ['ActivitiesId']=15001,
 },
@@ -1667,9 +1667,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=177,
 ['Name']='植树节兑换',
 ['Order']=24,
-['ExchangeCondition']={{183,288}},
+['ExchangeCondition']={{183,1288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{856,1}},
 ['ActivitiesId']=15001,
 },
@@ -1677,9 +1677,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=178,
 ['Name']='植树节兑换',
 ['Order']=25,
-['ExchangeCondition']={{183,288}},
+['ExchangeCondition']={{183,1288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{857,1}},
 ['ActivitiesId']=15001,
 },
@@ -1687,9 +1687,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=179,
 ['Name']='植树节兑换',
 ['Order']=26,
-['ExchangeCondition']={{183,288}},
+['ExchangeCondition']={{183,1288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{858,1}},
 ['ActivitiesId']=15001,
 },
@@ -1697,9 +1697,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=180,
 ['Name']='植树节兑换',
 ['Order']=27,
-['ExchangeCondition']={{183,120}},
+['ExchangeCondition']={{183,240}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{20007,1}},
 ['ActivitiesId']=15001,
 },
@@ -1707,9 +1707,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=181,
 ['Name']='植树节兑换',
 ['Order']=28,
-['ExchangeCondition']={{183,120}},
+['ExchangeCondition']={{183,240}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{20008,1}},
 ['ActivitiesId']=15001,
 },
@@ -1757,9 +1757,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=186,
 ['Name']='植树节兑换',
 ['Order']=33,
-['ExchangeCondition']={{183,188}},
+['ExchangeCondition']={{183,388}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{855,1}},
 ['ActivitiesId']=15001,
 },
@@ -1767,9 +1767,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=187,
 ['Name']='植树节兑换',
 ['Order']=34,
-['ExchangeCondition']={{183,150}},
+['ExchangeCondition']={{183,1888}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12198,1}},
 ['ActivitiesId']=15001,
 },
@@ -1777,9 +1777,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=188,
 ['Name']='植树节兑换',
 ['Order']=35,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12191,1}},
 ['ActivitiesId']=15001,
 },
@@ -1787,9 +1787,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=189,
 ['Name']='植树节兑换',
 ['Order']=36,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12195,1}},
 ['ActivitiesId']=15001,
 },
@@ -1797,9 +1797,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=190,
 ['Name']='植树节兑换',
 ['Order']=37,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12194,1}},
 ['ActivitiesId']=15001,
 },
@@ -1807,9 +1807,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=191,
 ['Name']='植树节兑换',
 ['Order']=38,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12193,1}},
 ['ActivitiesId']=15001,
 },
@@ -1817,9 +1817,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=192,
 ['Name']='植树节兑换',
 ['Order']=39,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12163,1}},
 ['ActivitiesId']=15001,
 },
@@ -1827,9 +1827,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=193,
 ['Name']='植树节兑换',
 ['Order']=40,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12186,1}},
 ['ActivitiesId']=15001,
 },
@@ -1837,9 +1837,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=194,
 ['Name']='植树节兑换',
 ['Order']=41,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12197,1}},
 ['ActivitiesId']=15001,
 },
@@ -1847,9 +1847,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=195,
 ['Name']='植树节兑换',
 ['Order']=42,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,288}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{12196,1}},
 ['ActivitiesId']=15001,
 },
@@ -1857,9 +1857,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=196,
 ['Name']='植树节兑换',
 ['Order']=43,
-['ExchangeCondition']={{183,30}},
+['ExchangeCondition']={{183,80}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{264,1}},
 ['ActivitiesId']=15001,
 },
@@ -1867,9 +1867,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=197,
 ['Name']='植树节兑换',
 ['Order']=44,
-['ExchangeCondition']={{183,30}},
+['ExchangeCondition']={{183,50}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{261,1}},
 ['ActivitiesId']=15001,
 },
@@ -1877,7 +1877,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=198,
 ['Name']='植树节兑换',
 ['Order']=45,
-['ExchangeCondition']={{183,1}},
+['ExchangeCondition']={{183,3}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{140,1}},
@@ -1887,9 +1887,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=199,
 ['Name']='植树节兑换',
 ['Order']=46,
-['ExchangeCondition']={{183,30}},
+['ExchangeCondition']={{183,60}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=9,
 ['Reward']={{237,1}},
 ['ActivitiesId']=15001,
 },
@@ -1897,7 +1897,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=200,
 ['Name']='植树节兑换',
 ['Order']=47,
-['ExchangeCondition']={{183,15}},
+['ExchangeCondition']={{183,25}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{200,1}},
@@ -1907,9 +1907,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=201,
 ['Name']='植树节兑换',
 ['Order']=48,
-['ExchangeCondition']={{183,88}},
+['ExchangeCondition']={{183,188}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{529,1}},
 ['ActivitiesId']=15001,
 },
@@ -1917,9 +1917,9 @@ local ActivitiesCollectionCfg = {
 ['Id']=202,
 ['Name']='植树节兑换',
 ['Order']=49,
-['ExchangeCondition']={{183,10}},
+['ExchangeCondition']={{183,88}},
 ['ServersReward']=0,
-['Number']=999,
+['Number']=99,
 ['Reward']={{528,1}},
 ['ActivitiesId']=15001,
 },
@@ -1927,7 +1927,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=203,
 ['Name']='植树节兑换',
 ['Order']=50,
-['ExchangeCondition']={{183,1}},
+['ExchangeCondition']={{183,2}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{100,1}},
@@ -1937,7 +1937,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=204,
 ['Name']='植树节兑换',
 ['Order']=51,
-['ExchangeCondition']={{183,2}},
+['ExchangeCondition']={{183,4}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{110,1}},
@@ -1947,7 +1947,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=205,
 ['Name']='植树节兑换',
 ['Order']=52,
-['ExchangeCondition']={{183,15}},
+['ExchangeCondition']={{183,188}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{268,1}},
@@ -1957,7 +1957,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=206,
 ['Name']='植树节兑换',
 ['Order']=53,
-['ExchangeCondition']={{183,40}},
+['ExchangeCondition']={{183,128}},
 ['ServersReward']=0,
 ['Number']=20,
 ['Reward']={{520,1}},
@@ -1967,7 +1967,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=207,
 ['Name']='植树节兑换',
 ['Order']=54,
-['ExchangeCondition']={{183,55}},
+['ExchangeCondition']={{183,388}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{690,1}},
@@ -1977,7 +1977,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=208,
 ['Name']='植树节兑换',
 ['Order']=55,
-['ExchangeCondition']={{183,45}},
+['ExchangeCondition']={{183,266}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{704,1}},
@@ -1987,7 +1987,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=209,
 ['Name']='植树节兑换',
 ['Order']=56,
-['ExchangeCondition']={{183,8}},
+['ExchangeCondition']={{183,50}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{128,1}},
@@ -1997,7 +1997,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=210,
 ['Name']='植树节兑换',
 ['Order']=57,
-['ExchangeCondition']={{183,5}},
+['ExchangeCondition']={{183,50}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{130,1}},
@@ -2007,7 +2007,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=211,
 ['Name']='植树节兑换',
 ['Order']=58,
-['ExchangeCondition']={{183,5}},
+['ExchangeCondition']={{183,50}},
 ['ServersReward']=0,
 ['Number']=999,
 ['Reward']={{131,1}},
@@ -2017,7 +2017,7 @@ local ActivitiesCollectionCfg = {
 ['Id']=212,
 ['Name']='植树节兑换',
 ['Order']=59,
-['ExchangeCondition']={{183,30}},
+['ExchangeCondition']={{183,66}},
 ['ServersReward']=0,
 ['Number']=20,
 ['Reward']={{513,1}},

Assets/Lua/Config/ActivitiesFortnightOnlineCfg.lua

@@ -225,7 +225,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [29]={
 ['Id']=29,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -233,7 +233,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [30]={
 ['Id']=30,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -241,7 +241,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [31]={
 ['Id']=31,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,
@@ -249,7 +249,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [32]={
 ['Id']=32,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -257,7 +257,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [33]={
 ['Id']=33,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -265,7 +265,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [34]={
 ['Id']=34,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -273,7 +273,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [35]={
 ['Id']=35,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -281,7 +281,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [36]={
 ['Id']=36,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,
@@ -289,7 +289,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [37]={
 ['Id']=37,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -297,7 +297,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [38]={
 ['Id']=38,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,
@@ -305,7 +305,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [39]={
 ['Id']=39,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -313,7 +313,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [40]={
 ['Id']=40,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,
@@ -321,7 +321,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [41]={
 ['Id']=41,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -329,7 +329,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [42]={
 ['Id']=42,
-['Rewards']={{183,20}},
+['Rewards']={{183,40}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,

Assets/Lua/Config/ActivitiesTaskCfg.lua

@@ -8614,6 +8614,46 @@ local ActivitiesTaskCfg = {
     ['GoPageId']=117,
     ['ShowState']=1,
     ['Integral']=0,
+    },
+    [20133]={
+    ['TaskId']=20133,
+    ['TaskCondition']={{60,599.99}},
+    ['Reward']={{183,600},{2,1000000}},
+    ['Title']='活動期間累計儲值599.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20134]={
+    ['TaskId']=20134,
+    ['TaskCondition']={{60,699.99}},
+    ['Reward']={{183,600},{2,1000000}},
+    ['Title']='活動期間累計儲值699.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20135]={
+    ['TaskId']=20135,
+    ['TaskCondition']={{60,799.99}},
+    ['Reward']={{183,600},{2,1000000}},
+    ['Title']='活動期間累計儲值799.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20136]={
+    ['TaskId']=20136,
+    ['TaskCondition']={{60,899.99}},
+    ['Reward']={{183,600},{2,1000000}},
+    ['Title']='活動期間累計儲值899.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
     },
         [20140]={
     ['TaskId']=20140,

Assets/Lua/Config/ItemCfg1.lua

@@ -2539,7 +2539,7 @@ local ItemCfg1 = {
 ['Icon']='Items/icon_luomituanzi',
 ['MiniIcon']='',
 ['Job']=0,
-['Describe']='踏青活動道具，用於在揹包界面中澆灌種子收穫獎勵。活動結束後自動消失\n（獲取途徑：踏青活動、雜貨店）',
+['Describe']='踏青活动兑换时使用',
 ['ItemTime']=5,
 ['SkipInterface']=0,
 ['DebrisShow']=0,

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

Assets/Lua/UI/UIActivity/UIActivityDailyRechargeView.lua

@@ -37,6 +37,8 @@ end
 function UIActivityDailyRechargeView:Init()
 	self:InitGrid()
 	self:Refresh()
+	self.lastBtn:SetActive(false)
+	self.nextBtn:SetActive(false)
 end
 
 function UIActivityDailyRechargeView:OnPageInEnd()

ProjectSettings/EditorSettings.asset

@@ -3,8 +3,7 @@
 --- !u!159 &1
 EditorSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
-  m_ExternalVersionControlSupport: Visible Meta Files
+  serializedVersion: 11
   m_SerializationMode: 2
   m_LineEndingsForNewScripts: 2
   m_DefaultBehaviorMode: 0
@@ -12,14 +11,36 @@ EditorSettings:
     type: 3}
   m_PrefabUIEnvironment: {fileID: 102900000, guid: a1238f5bd7e0427408eb7f86186e7f43,
     type: 3}
-  m_SpritePackerMode: 2
+  m_SpritePackerMode: 0
   m_SpritePackerPaddingPower: 1
+  m_Bc7TextureCompressor: 0
   m_EtcTextureCompressorBehavior: 1
   m_EtcTextureFastCompressor: 1
   m_EtcTextureNormalCompressor: 2
   m_EtcTextureBestCompressor: 4
-  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref
   m_ProjectGenerationRootNamespace: 
-  m_CollabEditorSettings:
-    inProgressEnabled: 1
+  m_EnableTextureStreamingInEditMode: 1
   m_EnableTextureStreamingInPlayMode: 1
+  m_AsyncShaderCompilation: 1
+  m_CachingShaderPreprocessor: 1
+  m_PrefabModeAllowAutoSave: 1
+  m_EnterPlayModeOptionsEnabled: 0
+  m_EnterPlayModeOptions: 3
+  m_GameObjectNamingDigits: 1
+  m_GameObjectNamingScheme: 0
+  m_AssetNamingUsesSpace: 1
+  m_UseLegacyProbeSampleCount: 1
+  m_SerializeInlineMappingsOnOneLine: 0
+  m_DisableCookiesInLightmapper: 1
+  m_AssetPipelineMode: 1
+  m_RefreshImportMode: 0
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1
+  m_CacheServerEnableAuth: 0
+  m_CacheServerEnableTls: 0
+  m_CacheServerValidationMode: 2
+  m_CacheServerDownloadBatchSize: 128

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