Merge branch 'hy_dny_rgres' of ssh://192.168.0.8:29418/xianjing into hy_dny_16

Assets/Content/Config/LanguagePackage_cn.csv

@@ -1656,7 +1656,7 @@ ShopDesc_3,"The store list will automatically refresh at 8:00, 16:00, and 24:00
 ShopDesc_4,Join Guild Hunt daily to get Guild Coins\nParticipate in Guild War to get a large amount of Glorious Metal Shards
 ShopDesc_5,"Dismantling pets grants Dismantling Stones, which can be used to purchase items in the pet shop"
 ShopDesc_6,Participating in the Hundred-Person Dojo grants Dojo Certificates
-ShopDesc_8, Willow Talismans can be obtained in the <color=#078df5>Twelve Flower Letters</color> event\nDuring the event, participating in the <color=#078df5>Daily Accumulated Deposit</color> can also get <color=#078df5>a large number of</color> Willow Talismans\nThe event will end in <color=#00AB65>{0}</color>
+ShopDesc_8, Frostcoin is obtainable via the Cumulative Top-up Event and the Frostveil Blessings Event.\nThe event will end in <color=#00AB65>{0}</color>
 ShopDesc_9, Limited-time benefits for new servers: complete the <color=#00AB65>7-Day Target Missions</color> to get a large number of <color=#00AB65>Carnival Vouchers</color>, which can be used to redeem products\nThe Carnival event will end in <color=#00AB65>{0}</color>\n<color=#fe5478>The shop and voucher event will disappear automatically after ending</color>
 ShopDesc_11, Returning event products can be purchased here
 ShopDesc_12, Participate in the Voyage Trial and complete it to obtain <color=#00AB65>Voyage Certificates</color>, which can be used to buy precious items in the Voyage Shop!
@@ -12665,7 +12665,7 @@ ICfg_Name_14044,Pure Sash
 ICfg_Describe_329,Item used to activate the **Odin Guardian Avatar Frame** (Acquisition: VIP)
 ICfg_Describe_596,Consume 10,000 Zeny to open. Obtain one of the Four Emperors, 【Necromancer】, and 200,000 Pet EXP. The Summon Voucher will disappear in 7 days due to fading magic.
 ICfg_Name_596,【MVP】Necromancer Summon Voucher II
-ICfg_Describe_160,Open to receive: Willow Leaf Talisman, Moonlight Key, Stardust Key, Zeny
+ICfg_Describe_160,Open to receive:Frostcoin, Moonlight Key, Stardust Key, Zeny
 ICfg_Name_160,Intermediate Gift Box
 ICfg_Name_837,Wanderer Wolf
 ICfg_Describe_337,Item used to activate the **Virgo Avatar Frame** (Acquisition: Astrological Season)
@@ -12804,7 +12804,7 @@ ICfg_Describe_14008,<color=#078df5>Colored Carrot</color> Intermediate Material.
 ICfg_Name_14008,Green Radish
 ICfg_Describe_3005,A staff adorned with beautiful feathers. It is said that the Spirit of Wind is sealed within the staff.\n(Applicable to: Mage)
 ICfg_Describe_156,Can be exchanged for rewards in the event
-ICfg_Name_156,Song
+ICfg_Name_156,Icy Rune
 ICfg_Describe_313,Item used to activate the **Cloud-Treading Moon-Chaser Avatar Frame** (Acquisition: Rune Merchant)
 ICfg_Describe_14004,<color=#078df5>Concentrated Orange Juice</color> Intermediate Material. Can activate the corresponding Relic to Tier 3 in the Relic House.\nCharacters Enhanced: Ai
 ICfg_Name_14004,Round-Bottom Drink Bottle
@@ -13347,14 +13347,14 @@ ICfg_Describe_648,Open to receive 1 Purple 2nd Tier Weapon for all classes
 ICfg_Name_648,Purple 2nd Tier Weapon Pack
 ICfg_Describe_905,Collect 20 to synthesize Bathory
 ICfg_Name_905,Bathory Shard
-ICfg_Name_157,Oriole
+ICfg_Name_157,Frost Shard
 ICfg_Describe_34,Guild currency, can be used to purchase items in the Guild War Shop (Acquisition: Guild War)
 ICfg_Name_34,Brilliant Metal Shard
 ICfg_Describe_633,Open to randomly receive one Red 1st Tier Weapon
 ICfg_Name_633,Red 1st Tier Weapon
 ICfg_Describe_12155,Recommended: Swordsman, Thief, Archer, Mage, Acolyte (Acquisition: Summon)
-ICfg_Describe_153,Exchange item
-ICfg_Name_153,Willow Leaf Talisman
+ICfg_Describe_153,Redeem items at the "Hollowwinter Bazaar" with this; Obtainable via the Cumulative Top-up Event and the "Frostveil Blessings" Event.
+ICfg_Name_153,Frostcoin
 ICfg_Describe_35,Mileage EXP (Acquisition: Adventure Quest)
 ICfg_Describe_13026,Can be used to craft a Headset
 ICfg_Describe_1001,A considerably large sword with a cross-shaped hilt.\n(Applicable to: Swordsman)
@@ -13693,11 +13693,11 @@ ICfg_Name_652,Golden Tier 3 Weapon Pack
 ICfg_Describe_909,Collect 20 to synthesize **Lunatic**.
 ICfg_Name_909,Lunatic Shard
 ICfg_Describe_158,Randomly gain one of 4 Chinese characters upon opening.
-ICfg_Name_158,Word Collection Box
+ICfg_Name_158,Frostspire Box
 ICfg_Describe_1501,A short and light Staff, suitable for Novice Mages\n(Applicable to: Acolyte)
 ICfg_Describe_317,Item used to activate the **Halloween Fantasy** avatar frame
 ICfg_Describe_2015,A bow adorned with pure white wings, beautiful like a graceful swan\n(Applicable to: Archer)
-ICfg_Name_154,Dance
+ICfg_Name_154,Glacial Tear
 ICfg_Describe_14013,Novice material for <color=#078df5>**Rusty Iron**</color>. Can be used in the Collection House to activate the corresponding collection\nCharacter Boost: **Hardin**
 ICfg_Name_14013,Iron Ingot
 ICfg_Describe_8,Can be used in Cumulative Recharge and Daily Recharge. Cannot be used to purchase Gift Packs.
@@ -14096,7 +14096,7 @@ ICfg_Describe_703,Open to select one Purple Tier 3 Armor
 ICfg_Name_703,Purple Tier 3 Optional Armor Box
 ICfg_Describe_689,Open to select one Purple Tier 3 Weapon
 ICfg_Name_689,Purple Tier 3 Optional Weapon Box
-ICfg_Name_155,燕
+ICfg_Name_155,Snow Wisp Core
 ICfg_Describe_5015,Sea God Aegir's Armor. With the beautiful appearance of a mermaid, the wearer seems able to swim in the water.
 ICfg_Describe_13154,Can be used to craft a **Gown Headwear (Female)** (Acquisition: Limited-Time Pack)
 ICfg_Name_13154,Gown Headwear (Female) Blueprint
@@ -16028,7 +16028,7 @@ ShopCfg_GoodsDesc_30091,Job Type: Novice, Swordman\nEquip Level: 4\nP.ATK: +112
 ShopCfg_GoodsDesc_10057,Use to instantly gain 4 hours of AFK Main Character EXP
 ShopCfg_GoodsDesc_30157,Job Type: All Jobs\nEquip Level: 7\nSP: +25
 ShopCfg_GoodsDesc_40003,Opens to randomly receive one Blue Tier 2 Equipment
-ShopCfg_GoodsDesc_10026,Opens to receive 1 random Chinese character from "新年快樂" (Happy New Year)
+ShopCfg_GoodsDesc_10026,Open to obtain one of "Frost Shard", "Icy Run", "Snow Wisp Core" and "Glacial Tear" (Frostspire Conquest)
 ShopCfg_GoodsName_50013,Pet Shard - Golden Thief Bug
 ShopCfg_GoodsDesc_50013,Collect 20 to obtain MVP Pet - Golden Thief Bug
 ShopCfg_GoodsDesc_30223,Slot: Headgear\nM.ATK +9\nSP +2
@@ -16257,7 +16257,7 @@ ShopCfg_GoodsDesc_30204,Job Type: Mage\nEquip Level: 1\nM.ATK: +14
 ShopTypeCfg_Name_12,Voyage Shop
 ShopTypeCfg_Name_11,Re-Run Shop
 ShopTypeCfg_Name_10,Carnival
-ShopTypeCfg_Name_9,Flower God Workshop
+ShopTypeCfg_Name_9,Hollowwinter Bazaar
 ShopTypeCfg_Name_50,Cash Shop
 ShopTypeCfg_Name_3,Black Market
 SkillShowCfg_Name_13127,Advanced Charge Arrow Hunter
@@ -19218,4 +19218,5 @@ DeleteNtfTxt2,This is the final confirmation.\nAre you absolutely sure you want
 DeleteEndNtfTxt,Thank you for playing! This process will take 1-10 business days.
 DeleteErrorTxt,Account deletion has been applied for, please wait patiently.
 LoginGetServerListError,Too many players online. Please try again later.
-LoginGetServerListErrorString,Too many players are logging in. Retrying in {0}s.
+LoginGetServerListErrorString,Too many players are logging in. Retrying in {0}s.
+SdkLinkTxt,#c00ab65\nDear Adventurers,We are currently fixing an issue with in-app purchases.\n In the meantime, please use our Web Payment Center for recharge. Enjoy extra rewards for web recharge!\n Web Payment Center: #cff9800#t#hhttps://i.dze-game.com/recharge_center{https://i.dze-game.com/recharge_center}#h#t \n#c00ab65 Sorry for the trouble.

Assets/Content/Icons/Activity_NewYear.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7d0798fe41009c148b02493a8bf09c2a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/icon_12_yezi.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: eca1c8590bf803f469ad8196ab3c53ec
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/icon_1_wu.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: c099dfbec5100914d95b0cca85290b38
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/icon_2_ge.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 89bdc265a49bf3846b22bfa606e46866
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/icon_3_yan.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: dcfe50c579564e34a8099f7aaeda24e1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/icon_4_ying.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: dc65823dffa6dee48b3815ba853866cf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/item_wordsbox3.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 96791b383147b744a9e0e2cd275b57cb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/newyear_cn.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: c4a0c7eaad5f38f4b800bf4a1ced4f69
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/newyearlogin_cn.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 1e4dbb895666b1b4782b8caeee8611f7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Activity_NewYear/newyearshop_cn.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: a0c4527868ba89f44bd746bf8d0581db
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Config/ActivitiesCfg.lua

@@ -75,8 +75,8 @@ local ActivitiesCfg = {
 ['Type']=4,
 ['Name']='ActCfg_Name6',
 ['Order']=6,
-['BG']='ActivityImg/active_icon_shier',
-['ActivityBG']='ActivityImg/active_icon_shier',
+['BG']='Activity_NewYear/newyearlogin_cn',
+['ActivityBG']='Activity_NewYear/newyearlogin_cn',
 ['PageId']=304,
 ['Entrance']={159},
 ['NeedShow']=true,
@@ -89,8 +89,8 @@ local ActivitiesCfg = {
 ['Type']=7,
 ['Name']='ActCfg_Name7',
 ['Order']=7,
-['BG']='ActivityImg/active_icon_jie',
-['ActivityBG']='ActivityImg/active_icon_jie',
+['BG']='Activity_NewYear/newyear_cn',
+['ActivityBG']='Activity_NewYear/newyear_cn',
 ['PageId']=365,--320
 ['Entrance']={159},
 ['HdDrop']={154,155,156,157,158},
@@ -104,7 +104,7 @@ local ActivitiesCfg = {
 ['Type']=8,
 ['Name']='ActCfg_Name8',
 ['Order']=8,
-['BG']='ActivityImg/active_icon_sichun',
+['BG']='Activity_NewYear/newyearshop_cn',
 ['ActivityBG']='',
 ['PageId']=153,
 ['Entrance']={159},

Assets/Lua/Config/ActivitiesTiredChargeCfg.lua

@@ -3,7 +3,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=1,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{175,100},{531,1},{2,20000},{131,1},{129,1}},
+    ['Reward']={{153,50},{175,100},{531,1},{2,20000},{131,1},{129,1}},
     ['Day']=1,
     ['Index']=1,
     },
@@ -11,7 +11,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=2,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{175,200},{531,2},{2,40000},{131,1},{130,1}},
+    ['Reward']={{153,100},{175,200},{531,2},{2,40000},{131,1},{130,1}},
     ['Day']=1,
     ['Index']=2,
     },
@@ -19,7 +19,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=3,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{175,300},{513,1},{2,100000},{135,1},{134,1}},
+    ['Reward']={{153,150},{175,300},{513,1},{2,100000},{135,1},{134,1}},
     ['Day']=1,
     ['Index']=3,
     },
@@ -27,7 +27,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=4,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{175,500},{513,1},{607,1},{135,1},{134,1}},
+    ['Reward']={{153,200},{175,500},{513,1},{607,1},{135,1},{134,1}},
     ['Day']=1,
     ['Index']=4,
     },
@@ -35,7 +35,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=5,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{175,1000},{513,1},{687,1},{135,1},{134,1}},
+    ['Reward']={{153,300},{175,1000},{513,1},{687,1},{135,1},{134,1}},
     ['Day']=1,
     ['Index']=5,
     },
@@ -43,7 +43,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=6,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{175,1000},{513,1},{523,1},{141,3},{139,1}},
+    ['Reward']={{153,400},{175,1000},{513,1},{523,1},{141,3},{139,1}},
     ['Day']=1,
     ['Index']=6,
     },
@@ -51,7 +51,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=7,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{175,2000},{520,1},{607,2},{139,1},{138,1}},
+    ['Reward']={{153,500},{175,2000},{520,1},{607,2},{139,1},{138,1}},
     ['Day']=1,
     ['Index']=7,
     },
@@ -59,7 +59,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=8,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{175,3000},{520,2},{523,1},{608,1},{141,3}},
+    ['Reward']={{153,600},{175,3000},{520,2},{523,1},{608,1},{141,3}},
     ['Day']=1,
     ['Index']=8,
     },
@@ -67,7 +67,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=9,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{175,5000},{520,2},{523,1},{688,1},{138,2}},
+    ['Reward']={{153,800},{175,5000},{520,2},{523,1},{688,1},{138,2}},
     ['Day']=1,
     ['Index']=9,
     },
@@ -75,7 +75,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=10,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{531,1},{2,20000},{131,1},{129,1}},
+    ['Reward']={{153,50},{531,1},{2,20000},{131,1},{129,1}},
     ['Day']=15,
     ['Index']=1,
     },
@@ -83,7 +83,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=11,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{531,2},{2,40000},{131,1},{130,1}},
+    ['Reward']={{153,100},{531,2},{2,40000},{131,1},{130,1}},
     ['Day']=15,
     ['Index']=2,
     },
@@ -91,7 +91,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=12,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{513,5},{2,100000},{135,1},{134,1}},
+    ['Reward']={{153,150},{513,5},{2,100000},{135,1},{134,1}},
     ['Day']=15,
     ['Index']=3,
     },
@@ -99,7 +99,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=13,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{513,1},{607,1},{135,1},{134,1}},
+    ['Reward']={{153,200},{513,1},{607,1},{135,1},{134,1}},
     ['Day']=15,
     ['Index']=4,
     },
@@ -107,7 +107,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=14,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{513,1},{687,1},{135,1},{134,1}},
+    ['Reward']={{153,300},{513,1},{687,1},{135,1},{134,1}},
     ['Day']=15,
     ['Index']=5,
     },
@@ -115,7 +115,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=15,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{513,1},{523,1},{141,3},{139,1}},
+    ['Reward']={{153,400},{513,1},{523,1},{141,3},{139,1}},
     ['Day']=15,
     ['Index']=6,
     },
@@ -123,7 +123,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=16,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{520,1},{607,2},{139,1},{138,1}},
+    ['Reward']={{153,500},{520,1},{607,2},{139,1},{138,1}},
     ['Day']=15,
     ['Index']=7,
     },
@@ -131,7 +131,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=17,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{520,2},{523,1},{608,1},{141,3}},
+    ['Reward']={{153,600},{520,2},{523,1},{608,1},{141,3}},
     ['Day']=15,
     ['Index']=8,
     },
@@ -139,7 +139,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=18,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{520,2},{523,1},{688,1},{138,2}},
+    ['Reward']={{153,800},{520,2},{523,1},{688,1},{138,2}},
     ['Day']=15,
     ['Index']=9,
     },
@@ -147,7 +147,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=19,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{528,1},{47,50000},{531,2},{2,20000}},
+    ['Reward']={{153,50},{528,1},{47,50000},{531,2},{2,20000}},
     ['Day']=29,
     ['Index']=1,
     },
@@ -155,7 +155,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=20,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{115,20},{47,100000},{531,2},{2,50000}},
+    ['Reward']={{153,100},{115,20},{47,100000},{531,2},{2,50000}},
     ['Day']=29,
     ['Index']=2,
     },
@@ -163,7 +163,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=21,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{116,20},{47,200000},{531,5},{2,100000}},
+    ['Reward']={{153,150},{116,20},{47,200000},{531,5},{2,100000}},
     ['Day']=29,
     ['Index']=3,
     },
@@ -171,7 +171,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=22,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{45,20000},{47,300000},{531,10},{2,200000}},
+    ['Reward']={{153,200},{45,20000},{47,300000},{531,10},{2,200000}},
     ['Day']=29,
     ['Index']=4,
     },
@@ -179,7 +179,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=23,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{687,2},{47,300000},{531,10},{2,300000}},
+    ['Reward']={{153,300},{687,2},{47,300000},{531,10},{2,300000}},
     ['Day']=29,
     ['Index']=5,
     },
@@ -187,7 +187,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=24,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{687,3},{47,300000},{531,10},{2,500000}},
+    ['Reward']={{153,400},{687,3},{47,300000},{531,10},{2,500000}},
     ['Day']=29,
     ['Index']=6,
     },
@@ -195,7 +195,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=25,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{610,1},{47,300000},{134,2},{2,800000}},
+    ['Reward']={{153,500},{610,1},{47,300000},{134,2},{2,800000}},
     ['Day']=29,
     ['Index']=7,
     },
@@ -203,7 +203,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=26,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{687,3},{47,500000},{531,20},{2,1000000}},
+    ['Reward']={{153,600},{687,3},{47,500000},{531,20},{2,1000000}},
     ['Day']=29,
     ['Index']=8,
     },
@@ -211,7 +211,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=27,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{610,1},{47,500000},{138,3},{2,1000000}},
+    ['Reward']={{153,800},{610,1},{47,500000},{138,3},{2,1000000}},
     ['Day']=29,
     ['Index']=9,
     },
@@ -219,7 +219,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=28,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{528,1},{47,50000},{531,2},{2,20000}},
+    ['Reward']={{153,50},{528,1},{47,50000},{531,2},{2,20000}},
     ['Day']=43,
     ['Index']=1,
     },
@@ -227,7 +227,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=29,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{115,20},{47,100000},{531,2},{2,50000}},
+    ['Reward']={{153,100},{115,20},{47,100000},{531,2},{2,50000}},
     ['Day']=43,
     ['Index']=2,
     },
@@ -235,7 +235,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=30,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{116,20},{47,200000},{531,5},{2,100000}},
+    ['Reward']={{153,150},{116,20},{47,200000},{531,5},{2,100000}},
     ['Day']=43,
     ['Index']=3,
     },
@@ -243,7 +243,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=31,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{45,20000},{47,300000},{531,10},{2,200000}},
+    ['Reward']={{153,200},{45,20000},{47,300000},{531,10},{2,200000}},
     ['Day']=43,
     ['Index']=4,
     },
@@ -251,7 +251,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=32,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{687,2},{47,300000},{531,10},{2,300000}},
+    ['Reward']={{153,300},{687,2},{47,300000},{531,10},{2,300000}},
     ['Day']=43,
     ['Index']=5,
     },
@@ -259,7 +259,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=33,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{687,3},{47,300000},{531,10},{2,500000}},
+    ['Reward']={{153,400},{687,3},{47,300000},{531,10},{2,500000}},
     ['Day']=43,
     ['Index']=6,
     },
@@ -267,7 +267,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=34,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{610,1},{47,300000},{134,2},{2,800000}},
+    ['Reward']={{153,500},{610,1},{47,300000},{134,2},{2,800000}},
     ['Day']=43,
     ['Index']=7,
     },
@@ -275,7 +275,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=35,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{687,3},{47,500000},{531,20},{2,1000000}},
+    ['Reward']={{153,600},{687,3},{47,500000},{531,20},{2,1000000}},
     ['Day']=43,
     ['Index']=8,
     },
@@ -283,7 +283,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=36,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{610,1},{47,500000},{138,3},{2,1000000}},
+    ['Reward']={{153,800},{610,1},{47,500000},{138,3},{2,1000000}},
     ['Day']=43,
     ['Index']=9,
     },
@@ -291,7 +291,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=37,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{528,1},{47,50000},{531,2},{2,20000}},
+    ['Reward']={{153,50},{528,1},{47,50000},{531,2},{2,20000}},
     ['Day']=57,
     ['Index']=1,
     },
@@ -299,7 +299,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=38,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{115,20},{47,100000},{531,2},{2,50000}},
+    ['Reward']={{153,100},{115,20},{47,100000},{531,2},{2,50000}},
     ['Day']=57,
     ['Index']=2,
     },
@@ -307,7 +307,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=39,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{116,20},{47,200000},{531,5},{2,100000}},
+    ['Reward']={{153,150},{116,20},{47,200000},{531,5},{2,100000}},
     ['Day']=57,
     ['Index']=3,
     },
@@ -315,7 +315,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=40,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{45,20000},{47,300000},{531,10},{2,200000}},
+    ['Reward']={{153,200},{45,20000},{47,300000},{531,10},{2,200000}},
     ['Day']=57,
     ['Index']=4,
     },
@@ -323,7 +323,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=41,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{687,2},{47,300000},{531,10},{2,300000}},
+    ['Reward']={{153,300},{687,2},{47,300000},{531,10},{2,300000}},
     ['Day']=57,
     ['Index']=5,
     },
@@ -331,7 +331,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=42,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{687,3},{47,300000},{531,10},{2,500000}},
+    ['Reward']={{153,400},{687,3},{47,300000},{531,10},{2,500000}},
     ['Day']=57,
     ['Index']=6,
     },
@@ -339,7 +339,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=43,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{610,1},{47,300000},{134,2},{2,800000}},
+    ['Reward']={{153,500},{610,1},{47,300000},{134,2},{2,800000}},
     ['Day']=57,
     ['Index']=7,
     },
@@ -347,7 +347,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=44,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{687,3},{47,500000},{531,20},{2,1000000}},
+    ['Reward']={{153,600},{687,3},{47,500000},{531,20},{2,1000000}},
     ['Day']=57,
     ['Index']=8,
     },
@@ -355,7 +355,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=45,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{610,1},{47,500000},{138,3},{2,1000000}},
+    ['Reward']={{153,800},{610,1},{47,500000},{138,3},{2,1000000}},
     ['Day']=57,
     ['Index']=9,
     },

Assets/Lua/Config/ItemCfg1.lua

@@ -1867,8 +1867,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/icon_12_yezi',
-['MiniIcon']='Common/icon_12_yezi',
+['Icon']='Activity_NewYear/icon_12_yezi',
+['MiniIcon']='Activity_NewYear/icon_12_yezi',
 ['Job']=0,
 ['Describe']='ICfg_Describe_153',
 ['ItemTime']=5,
@@ -1888,8 +1888,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/icon_1_wu',
-['MiniIcon']='Common/icon_1_wu',
+['Icon']='Activity_NewYear/icon_1_wu',
+['MiniIcon']='Activity_NewYear/icon_1_wu',
 ['Job']=0,
 ['Describe']='ICfg_Describe_156',
 ['ItemTime']=5,
@@ -1909,8 +1909,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/icon_3_yan',
-['MiniIcon']='Common/icon_3_yan',
+['Icon']='Activity_NewYear/icon_3_yan',
+['MiniIcon']='Activity_NewYear/icon_3_yan',
 ['Job']=0,
 ['Describe']='ICfg_Describe_156',
 ['ItemTime']=5,
@@ -1930,8 +1930,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/icon_2_ge',
-['MiniIcon']='Common/icon_2_ge',
+['Icon']='Activity_NewYear/icon_2_ge',
+['MiniIcon']='Activity_NewYear/icon_2_ge',
 ['Job']=0,
 ['Describe']='ICfg_Describe_156',
 ['ItemTime']=5,
@@ -1951,8 +1951,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/icon_4_ying',
-['MiniIcon']='Common/icon_4_ying',
+['Icon']='Activity_NewYear/icon_4_ying',
+['MiniIcon']='Activity_NewYear/icon_4_ying',
 ['Job']=0,
 ['Describe']='ICfg_Describe_156',
 ['ItemTime']=5,
@@ -1972,7 +1972,7 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=0,
-['Icon']='Items/item_wordsbox3',
+['Icon']='Activity_NewYear/item_wordsbox3',
 ['MiniIcon']='',
 ['Job']=0,
 ['ComposeItem']={4903},

Assets/Lua/Core/Constant.lua

@@ -9,6 +9,8 @@ local Constant = {
 
     DeleteAccount = false, -- 删除账户
 
+    OpenSystemLink = false,
+
     HeroLeaderIcon = "FrameNew/label_main",
     HeroBattleIcon = "FrameNew/label_battling",
 

Assets/Lua/Enum/Enum.lua

@@ -1059,6 +1059,8 @@ local Enum = {
         IdolGiftBroad = 16, -- 偶像馈赠播报
         LuckyEgg = 17, -- 砸蛋奖励播报
 
+        SdkLink = 18, 
+
         TimeLimitDel = 100,
     },
 

Assets/Lua/Logic/ChatData.lua

@@ -31,7 +31,9 @@ function ChatData:Init()
 
     table.insert(self.data.systemDatas, 1, welcomeSystemData)
     table.insert(self.data.chatDatas.worldChats, 1, welcomeSystemData)
-
+    if Constant.OpenSystemLink then
+         ManagerContainer.LuaTimerMgr:AddTimer(5000, 1, self, self.AddSdkLink, nil)      
+    end
     if not privateChatPersistentSystem then
         privateChatPersistentSystem = require("PrivateChatPersistentSystem"):new()
     end
@@ -661,4 +663,21 @@ function ChatData:GetChatChannelType()
 	return self.data.channelType or Enum.ChatChannel.World
 end
 
+
+function  ChatData:AddSdkLink()
+     local SdkLinkSystemData = {}
+    SdkLinkSystemData.type = Enum.ChatSystemType.SdkLink
+    SdkLinkSystemData.isSystem = true
+    SdkLinkSystemData.nickname = "SdkLinkTxt"
+    SdkLinkSystemData.sendTime = 0
+
+    --if #self.data.systemDatas >1 then
+    --     local lastData = self.data.systemDatas[#self.data.systemDatas]
+         --SdkLinkSystemData.sendTime = lastData.sendTime + 1 
+    --end
+   
+
+    table.insert(self.data.systemDatas, #self.data.systemDatas + 1, SdkLinkSystemData)
+    table.insert(self.data.chatDatas.worldChats, #self.data.chatDatas.worldChats + 1, SdkLinkSystemData)
+end
 return ChatData

Assets/Lua/UI/Common/ChatTextItemCtr.lua

@@ -28,6 +28,14 @@ function ChatTextItemCtr:SetData(wnd, item, logicData, enterType, onClickOwner,
             --if item.text.symbolTextEvent then
             --    item.text.symbolTextEvent:RegisterClickEvent(wnd, wnd.SystemChatHyperClick)
             --end
+        elseif  logicData.type == Enum.ChatSystemType.SdkLink then
+            item.text.symbolText.raycastTarget = true
+            item.text.symbolText.text = I18N.T(logicData.nickname)
+            item.text.symbolTextEvent:RegisterClickEvent(nil, function (hyperParam)
+                    local lurl = hyperParam
+                    --LogError("SdkLink hyperParam = "..hyperParam)
+                    UnityEngine.Application.OpenURL(lurl)
+                end)
         elseif logicData.type == Enum.ChatSystemType.PassMap then
             local levelData = ManagerContainer.CfgMgr:GetLevelDataById(logicData.paramIds[1])
             if levelData ~= nil then

Build/BuildDependenceResource/Login/港澳台_new/img_login00.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: da1604d17b741bf48b6dfaf419c0b247
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 56
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: d5289f9aecc690d45be49871b113529d
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Build/BuildDependenceResource/Login/港澳台_new/img_login01.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 9eb592dc9e2d3f14fa4e324439f8fb8e
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 10
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 34
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 710dc56643f2b0445a6af77a6d7e764e
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Build/BuildDependenceResource/Login/港澳台_new/img_login02.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: c50558a0b9e0b414b833edfc498548a8
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 10
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 34
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 085835d74a076f24ebce915f61652b9d
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Build/BuildDependenceResource/PackConfig.json

@@ -1073,8 +1073,8 @@
                 "VUPLEX_CCU",
                 "FPS_DISABLE"
             ],
-            "logo1RelativePath": "xlwy.png",
-            "loginRelativePath": "Default",
+            "logo1RelativePath": "Tw-new.png",
+            "loginRelativePath": "港澳台_new",
             "gameAssetsPath": "Default",
             "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
@@ -1129,8 +1129,8 @@
                 "VUPLEX_CCU",
                 "FPS_DISABLE"
             ],
-            "logo1RelativePath": "xlwy.png",
-            "loginRelativePath": "Default",
+            "logo1RelativePath": "Tw-new.png",
+            "loginRelativePath": "港澳台_new",
             "gameAssetsPath": "Default",
             "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
@@ -1664,7 +1664,7 @@
         {
             "channelName": "小龙",
             "appName": "萌新冒險家",
-            "distributeName": "正式服（东南亚）",
+            "distributeName": "正式服（新港澳台）",
             "channelUniqueId": "22002013",
             "bundleId": "com.Runjin.Wonderland",
             "gameVersionCode": {
@@ -1685,8 +1685,8 @@
                 "VUPLEX_CCU",
                 "FPS_DISABLE"
             ],
-            "logo1RelativePath": "ntquick.png",
-            "loginRelativePath": "Default",
+            "logo1RelativePath": "Tw-new.png",
+            "loginRelativePath": "港澳台_new",
             "gameAssetsPath": "Default",
             "specialFuncShield": false,
             "splashScreenRelativeFiles": [],