挂机

Assets/arts/atlas/icon/item.asset

@@ -14,6 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   spriteList:
   - {fileID: 21300000, guid: ca105ffa7d9ffc347a89f665c9e3c5e5, type: 3}
+  - {fileID: 21300000, guid: c4cb736ccf6b8be4d9846836cade4735, type: 3}
   - {fileID: 21300000, guid: 52da05fc5df88be4d8a092e24ccfa7fb, type: 3}
   - {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3}
   - {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3}
@@ -27,4 +28,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 899882c0d56e96d4caf5d82d2b469729, type: 3}
   - {fileID: 21300000, guid: 91e9e926c6246844aba4b734caefb6f9, type: 3}
   - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3}
-  spriteNameList: 31000000320000003300000034000000350000003600000037000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76
+  spriteNameList: 3100000021060000320000003300000034000000350000003600000037000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76

Assets/arts/atlas/ui/common.asset

@@ -39,6 +39,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3}
   - {fileID: 21300000, guid: d9bf4f9aeccbaef4db450cefbf2c0f2d, type: 3}
   - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3}
+  - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3}
+  - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3}
   - {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3}
   - {fileID: 21300000, guid: 7372681aea33b7b4099e3685b7ee975e, type: 3}
   - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3}
@@ -90,4 +92,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: b9543992e195f2f47a68966feb242e7a, type: 3}
   - {fileID: 21300000, guid: d19a454e30a654347bc427e316fa1cbf, type: 3}
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
-  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fed49916fee49916fef49916ff049916ff149916fc58e80a0c68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0a5c7820c01853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc922ecadc9a4a12138e0c7a11a50349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b47ffce428d252af848262af848272af848a07f7c4e3c864f1b7351fb6991c62c357451fb69f03a2d357551fb69a15c468db6ad7c4fb7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fc569b158
+  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fed49916fee49916fef49916ff049916ff149916fc58e80a0c68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0a3c7820ca4c7820ca5c7820c01853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc922ecadc9a4a12138e0c7a11a50349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b47ffce428d252af848262af848272af848a07f7c4e3c864f1b7351fb6991c62c357451fb69f03a2d357551fb69a15c468db6ad7c4fb7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fc569b158

Assets/arts/atlas/ui/common.spriteatlas

@@ -101,6 +101,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
   - {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3}
   - {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3}
+  - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3}
   - {fileID: 21300000, guid: 37058029318370c46be63c3fbe4d1758, type: 3}
   - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3}
   - {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3}
@@ -135,6 +136,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3}
   - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3}
   - {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, type: 3}
+  - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3}
   - {fileID: 21300000, guid: 70658f5f22e6038469c551a1665ae009, type: 3}
   - {fileID: 21300000, guid: 2e3a1fdfbb599ba4babe604659b6e1df, type: 3}
   - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3}
@@ -179,6 +181,7 @@ SpriteAtlas:
   - common_toast_1
   - common_board_5
   - common_board_4
+  - common_btn_blue_2
   - common_board_15
   - common_bg_2
   - common_line_1
@@ -213,6 +216,7 @@ SpriteAtlas:
   - common_board_9
   - common_board_14
   - common_chest_1
+  - common_btn_blue_1
   - common_dec_5
   - common_dec_7
   - common_info

Assets/arts/textures/ui/common/common_btn_blue_1.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: c692df1f4d1dfed42a66007b4e4cb315
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  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: 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: 32, y: 46, z: 32, w: 34}
+  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
+  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: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    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: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/textures/ui/common/common_btn_blue_2.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 7f07ec09931338d42bf26e2d0eb26677
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  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: 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: 24, y: 32, z: 24, w: 22}
+  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
+  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: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    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: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/proto/protocol.bytes

@@ -1,5 +1,5 @@
 
-<EFBFBD>|
+È}
 pb/proto/protocol.protocspb"ž

 Gift
 act_type
 
(RactType
@@ -128,7 +128,7 @@ chapter_id
 
(R	chapterId"
 
 chapter_id 
(R	chapterId"
 costs (2.cspb.RewardRcosts&
-mystery_box_idx (R
mysteryBoxIdx"†
+mystery_box_idx (R
mysteryBoxIdx"¡
 ChapterSettlementReq
 win
 
(Rwin
 
@@ -142,9 +142,10 @@ kills_boss 
(R	killsBoss#
 
clear_6_combo 
(Rclear6Combo"
 
clear_8_combo	 
(Rclear8Combo$
 clear_10_combo
- 
(Rclear10Combo
-skills_cast 
(R
-skillsCast"Ã

+ 
(Rclear10Combo
+
+skill_cast 
(R	skillCast
+	skill_box 
(RskillBox"Ã

 ChapterSettlementRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode&
 rewards (2.cspb.RewardRrewards
@@ -215,18 +216,27 @@ chapter_id
 
(R	chapterId
 heroes (2.cspb.HeroPutOnRsp.HeroesEntryRheroes9
 HeroesEntry
 key
 
(Rkey
-value 
(Rvalue:8
"<22>

-Idle$
-gold_drop_time
 
(RgoldDropTime$
-item_drop_time 
(RitemDropTime
+value 
(Rvalue:8
"_
+Idle
+claim_at
 
(RclaimAt
+ad_count 
(RadCount!
+energy_count 
(RenergyCount"
+IdleInfoReq"þ

+IdleInfoRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode
+claim_at 
(RclaimAt
 ad_count 
(RadCount!
-energy_count 
(RenergyCount"
-
IdleRewardReq"­

+energy_count 
(RenergyCount2
+items (2.cspb.IdleInfoRsp.ItemsEntryRitems8
+
+ItemsEntry
+key
 
(Rkey
+value 
(Rvalue:8
"
+
IdleRewardReq"|
 
IdleRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode$
-gold_drop_time 
(RgoldDropTime$
-item_drop_time 
(RitemDropTime&
-rewards (2.cspb.RewardRrewards"
+err_code
 
(2
.cspb.ErrCodeRerrCode
+claim_at 
(RclaimAt&
+rewards (2.cspb.RewardRrewards"
 IdleQuickReq
 ad
 
(Rad"Â

 IdleQuickRsp(

Packages/manifest.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.collab-proxy": "1.15.18",
-    "com.unity.device-simulator": "3.0.3-preview",
+    "com.unity.device-simulator": "3.1.0-preview",
     "com.unity.ide.rider": "2.0.7",
     "com.unity.ide.visualstudio": "2.0.15",
     "com.unity.ide.vscode": "1.2.5",

Packages/packages-lock.json

@@ -16,7 +16,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.device-simulator": {
-      "version": "3.0.3-preview",
+      "version": "3.1.0-preview",
       "depth": 0,
       "source": "registry",
       "dependencies": {},