取消连线

Assets/arts/atlas/ui/battle.spriteatlas

@@ -74,6 +74,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: eb993031b1a39cf44aeff35169dcd3a1, type: 3}
   - {fileID: 21300000, guid: fe271741bc843c8438da54d6990e17c0, type: 3}
   - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3}
+  - {fileID: 21300000, guid: 240351618896ab24ab3bac798b03d638, type: 3}
   - {fileID: 21300000, guid: c7fe3771679f6c54b985272020d00348, type: 3}
   - {fileID: 21300000, guid: 838c1c8120a67b34ab27b4317842f255, type: 3}
   - {fileID: 21300000, guid: d0aee8d1fbdc1c24ba90e2855e76d866, type: 3}
@@ -119,6 +120,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 9b35ea47339a8e94d9d4555e03956f35, type: 3}
   - {fileID: 21300000, guid: dce59e87488903e4b8f377a7eeda2748, type: 3}
   - {fileID: 21300000, guid: 9bc0dcc7b71c9c641ae3260d1192b2fd, type: 3}
+  - {fileID: 21300000, guid: 171686d7ccc6d384a9d726efca39d78c, type: 3}
   - {fileID: 21300000, guid: 8dac4cd77ddbe4544b8a44602bb5c9be, type: 3}
   - {fileID: 21300000, guid: fe261bf7aa095154c959b88cc97168f3, type: 3}
   - {fileID: 21300000, guid: d721a218fed03994f9f4fcb6047c1e38, type: 3}
@@ -203,6 +205,7 @@ SpriteAtlas:
   - battle_obstacle_rocket_left
   - battle_board_4
   - yellow_1
+  - battle_line_3
   - battle_hinder_21
   - battle_hinder_24
   - battle_obstacle_firesnake
@@ -248,6 +251,7 @@ SpriteAtlas:
   - battle_hinder_12
   - battle_hinder_28
   - battle_hinder_25
+  - battle_line_4
   - battle_skill_bg_green_1
   - battle_skill_bg_red_1
   - battle_obstacle_jelly

Assets/arts/textures/ui/battle/battle_line_3.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 240351618896ab24ab3bac798b03d638
+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: 0
+    wrapV: 0
+    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
+  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/battle/battle_line_4.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 171686d7ccc6d384a9d726efca39d78c
+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: 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
+  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 @@
 
-”Ð

+ÀÐ

 pb/proto/protocol.protocspb"ž

 Gift
 act_type
 
(RactType
@@ -105,7 +105,11 @@ trigger_at 
(R	triggerAt"d
 TriggerGoldGiftReq 
 gold_gift_id
 
(R
 goldGiftId"
-TriggerGoldGiftRsp"Ø
+TriggerGoldGiftRsp"
+AIHelpUnreadReq"Q
+AIHelpUnreadRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode
+count 
(Rcount"Ø
 Arena#
 
season_number
 
(RseasonNumber#
 
current_score 
(RcurrentScore
@@ -174,7 +178,7 @@ match_info 
(2.cspb.MatchPlayerInfoR	matchInfo"
 .cspb.HeroRarrayHeroes"E
 PVPChallengeSettlementReq
 win
 
(Rwin
-season 
(Rseason"´
+season 
(Rseason"ú

 PVPChallengeSettlementRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode9
 
@@ -182,8 +186,7 @@ settlement 
(2.cspb.ChallengeRecordInfoR
 settlement&
 rewards (2.cspb.RewardRrewards&
 total_win_count 
(R
totalWinCount(
-total_lose_count 
(RtotalLoseCount8
-act_arena_gift 
(2.cspb.ActArenaGiftRactArenaGift"
+total_lose_count 
(RtotalLoseCount"
 PVPRecordHistoryReq"t
 PVPRecordHistoryRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode3