gdl_123 6 ヶ月 前
コミット
f2b734ee68

+ 12 - 11
Assets/Content/Config/LanguagePackage_cn.csv

@@ -12785,8 +12785,8 @@ ICfg_Describe_917,Collect 20 **Owl Baron Shards** to synthesize Owl Baron
 ICfg_Name_917,Owl Baron Shard
 ICfg_Describe_14016,<color=#078df5>Monster Drink</color> Intermediate Material. Can activate the corresponding Relic to Tier 3 in the Relic House.\nCharacters Enhanced: Main Character 
 ICfg_Name_14016,Fresh Blood
-ICfg_Describe_148,New Year's Day Word Collection - "Dan". Can be exchanged for rewards in the New Year's Day event.
-ICfg_Name_148,Dan
+ICfg_Describe_148,"Christmas Stocking-You can redeem rewards in the event"
+ICfg_Name_148,Christmas Stocking
 ICfg_Describe_584,Lv 50 Pack
 ICfg_Describe_5014,Valkyrie Goddess's armor. The adventurer's body radiates white light when worn.
 ICfg_Describe_660,Contains 3500 Gold Coins and a Mysterious Treasure Basin. Opening the Treasure Basin grants a large amount of Gold Coins and the exclusive limited-time fashion item <color=#ff4b14>Angel Wings</color>
@@ -13331,8 +13331,8 @@ ICfg_Describe_133,Instantly grants 8 hours of Idle Zeny upon use (Acquisition: R
 ICfg_Name_133,8-Hour Idle Zeny Reward
 ICfg_Describe_937,Collect 20 to synthesize Vagabond Wolf
 ICfg_Name_937,Vagabond Wolf Shard
-ICfg_Describe_149,New Year's Character Collection - Double. Can be exchanged for rewards during the New Year's Event.
-ICfg_Name_149,Double
+ICfg_Describe_149,"Garland-You can redeem rewards in the event"
+ICfg_Name_149,Garland
 ICfg_Describe_664,Open to receive 600 Zeny and Level 6 Super Value Zeny Card
 ICfg_Name_664,Level 5 Super Value Zeny Card
 ICfg_Describe_11566,Open to select one 3rd Gen 3-Star MVP Artifact or Oridecon*100.\n(<color=#ff9600>Ares</color>, <color=#ff9600>Elix</color>, <color=#ff9600>Nitocris</color>, <color=#ff9600>Philosopher's Stone</color>, <color=#ff9600>Heracles</color>, <color=#ff9600>Járngreipr</color>, <color=#ff9600>Chronos</color>, <color=#ff9600>Gada Cudgel</color>, <color=#ff9600>Flask of Life</color>, <color=#ff9600>Vajra Bell</color>)
@@ -13674,7 +13674,7 @@ ICfg_Name_684,Blue Tier 1 Weapon Select Box
 ICfg_Describe_7006,Boots worn by the hero **Dita** when he killed the evil wolf. Can withstand strong attacks.
 ICfg_Describe_941,Collect 20 to synthesize **Baphomet**.
 ICfg_Name_941,Baphomet Shard
-ICfg_Describe_150,Randomly gain one of the 4 Chinese characters "雙旦狂歡" (New Year's Double Celebration) upon opening.
+ICfg_Describe_150,"Open to randomly receive one of: Garland, Christmas Stocking, Christmas Hat, Christmas Sticker"
 ICfg_Name_150,Double Celebration Box
 ICfg_Describe_13183,Can be used to craft **Ice Wings** (Source: Limited-Time Pack)
 ICfg_Name_13183,Ice Wings Blueprint
@@ -13684,8 +13684,8 @@ ICfg_Name_668,Level 2 Treasure Pot
 ICfg_Describe_925,Collect 20 to synthesize **Deviling**.
 ICfg_Name_925,Deviling Shard
 ICfg_Describe_4005,Katar that can find the enemy's weak spot, specially used for assassination\n(Applicable to: Thief)
-ICfg_Describe_146,Double Celebration Word Collection - "歡" (Joy). Can be exchanged for rewards during the Double Celebration Event.
-ICfg_Name_146,Joy
+ICfg_Describe_146,"Christmas Sticker-You can redeem rewards in the event"
+ICfg_Name_146,Christmas Sticker
 ICfg_Describe_6003,A helmet with a deer antler shape.
 ICfg_Describe_309,Item used to activate the **Season King** avatar frame (Source: Season)
 ICfg_Describe_652,Upon opening, gain 1 Golden Tier 3 Weapon for all classes.
@@ -14072,7 +14072,7 @@ ICfg_Describe_135,Use to directly gain 8 hours of AFK Skill EXP (Acquisition: Ru
 ICfg_Name_135,8 Hours AFK Skill EXP
 ICfg_Describe_929,Collect 20 to synthesize **Dark Lord**
 ICfg_Name_929,Dark Lord Shard
-ICfg_Describe_151,Open to randomly receive one of the 4 Chinese characters for "Dual Festival Carnival," with "Dual" being the most likely (Acquisition: Limited-Time Pack)
+ICfg_Describe_151,"Open to randomly receive one of the following: Garland, Christmas Stocking, Christmas Hat, Christmas Sticker, and you are more likely to get Garland"
 ICfg_Name_151,Advanced Dual Festival Gift Box
 ICfg_Describe_303,Item used to activate the **Celestial Queen's Guard** Frame (Acquisition: VIP)
 ICfg_Describe_672,Consumes 30,000 Gold to open. Grants 35,000 Gold and an Ultimate Treasure Pot. Ultimately grants the limited edition fashion <color=#ff4b14>**Angel Wing**</color>
@@ -14081,8 +14081,8 @@ ICfg_Describe_604,Open to randomly receive one Blue Tier 1 Equipment (Acquisitio
 ICfg_Name_604,Blue Tier 1 Equipment
 ICfg_Describe_913,Collect 20 to synthesize **Bigfoot**
 ICfg_Name_913,Bigfoot Shard
-ICfg_Describe_147,Dual Festival Word Collection - **狂** (Kuang/Carnival). Can be exchanged for rewards during the Dual Festival event
-ICfg_Name_147,
+ICfg_Describe_147,"Christmas Hat-You can redeem rewards in the event"
+ICfg_Name_147,Christmas Hat
 ICfg_Name_840,Rainbow Peco Peco
 ICfg_Describe_311,Item used to activate the **Nordic Mythology** Frame
 ICfg_Describe_13185,Can be used to craft a **Rabbit Ear Headwear** (Acquisition: Limited-Time Pack)
@@ -19202,4 +19202,5 @@ RSLCfg_Name_549,Astrologer Gift Pack
 RSLCfg_Name_548,Immortal Hero Costume Gift Pack
 RSLCfg_Name_550,Immortal Hero Costume Great Value Gift Pack
 ZsHmyPmXx,No information about ratings/scores yet~
-QsrYssdWjdMz,Enter player name to search~
+QsrYssdWjdMz,Enter player name to search~
+signinTxt,Sign-in Day <color=#FF9600>{0}</color>, Reward: <color=#FF9600>{1}</color>

+ 8 - 0
Assets/Content/Icons/ActivityImg_05.meta

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

BIN
Assets/Content/Icons/ActivityImg_05/christmas_cn.png


+ 135 - 0
Assets/Content/Icons/ActivityImg_05/christmas_cn.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: aecdcb5224c779440859036591b98448
+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: 

+ 8 - 0
Assets/Content/Icons/Items_01.meta

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

BIN
Assets/Content/Icons/Items_01/sd_01.png


+ 135 - 0
Assets/Content/Icons/Items_01/sd_01.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 64cdfd1d93654064a9994cc741615ce6
+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: 

BIN
Assets/Content/Icons/Items_01/sd_02.png


+ 135 - 0
Assets/Content/Icons/Items_01/sd_02.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: dc89256e4d9dd2a4eb0556c768ca471d
+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: 

BIN
Assets/Content/Icons/Items_01/sd_03.png


+ 135 - 0
Assets/Content/Icons/Items_01/sd_03.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: e92328f6b028da847b61a0f63a9aa03e
+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: 

BIN
Assets/Content/Icons/Items_01/sd_04.png


+ 135 - 0
Assets/Content/Icons/Items_01/sd_04.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 69ce75f88f8e56c4489d27c49c7883cb
+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: 

+ 2 - 2
Assets/Lua/Config/ActivitiesCfg.lua

@@ -60,8 +60,8 @@ local ActivitiesCfg = {
 ['Type']=7,
 ['Name']='ActCfg_Name5',
 ['Order']=3,
-['BG']='ActivityImg/christmas_cn',
-['ActivityBG']='ActivityImg/christmas_cn',
+['BG']='ActivityImg_05/christmas_cn',
+['ActivityBG']='ActivityImg_05/christmas_cn',
 ['PageId']=365,--310
 ['Entrance']={159},
 ['HdDrop']={146,147,148,149,150,151},

+ 8 - 8
Assets/Lua/Config/ItemCfg1.lua

@@ -1716,8 +1716,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/item_word_huan',
-['MiniIcon']='Common/ic_res_coinz',
+['Icon']='Items_01/sd_01',
+['MiniIcon']='Items_01/sd_01',
 ['Job']=0,
 ['Describe']='ICfg_Describe_146',
 ['ItemTime']=5,
@@ -1737,8 +1737,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/item_word_kuang',
-['MiniIcon']='Common/ic_res_coinz',
+['Icon']='Items_01/sd_02',
+['MiniIcon']='Items_01/sd_02',
 ['Job']=0,
 ['Describe']='ICfg_Describe_147',
 ['ItemTime']=5,
@@ -1758,8 +1758,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/item_word_dan',
-['MiniIcon']='Common/ic_res_coinz',
+['Icon']='Items_01/sd_03',
+['MiniIcon']='Items_01/sd_03',
 ['Job']=0,
 ['Describe']='ICfg_Describe_148',
 ['ItemTime']=5,
@@ -1779,8 +1779,8 @@ local ItemCfg1 = {
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,
-['Icon']='Items/item_word_shuang',
-['MiniIcon']='Common/ic_res_coinz',
+['Icon']='Items_01/sd_04',
+['MiniIcon']='Items_01/sd_04',
 ['Job']=0,
 ['Describe']='ICfg_Describe_149',
 ['ItemTime']=5,

+ 12 - 12
UserSettings/AndroidLogcatSettings.asset

@@ -2,40 +2,40 @@
     "m_SelectedDeviceId": "192.168.0.53:5555",
     "m_SelectedProcess": {
         "deviceId": "192.168.0.53:5555",
-        "name": "com.hues.daew",
-        "processId": 4385,
+        "name": "com.metasensor.ro.mi",
+        "processId": 4117,
         "exited": false
     },
     "m_SelectedPriority": 0,
     "m_KnownProcessesForSerialization": [
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 3178,
+            "name": "com.Runjin.Wonderland.gp",
+            "processId": 2704,
             "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 3398,
+            "name": "com.xjro.yy",
+            "processId": 2861,
             "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 3668,
+            "name": "com.metasensor.ro.mi",
+            "processId": 2702,
             "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 3839,
+            "name": "com.metasensor.ro.mi",
+            "processId": 3428,
             "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 4385,
+            "name": "com.metasensor.ro.mi",
+            "processId": 4117,
             "exited": false
         }
     ],