更新资源合pb

Assets/arts/atlas/ui/dungeon_armor.asset

@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a48bfa163a714a6d8469f9c542e223f, type: 3}
+  m_Name: dungeon_armor
+  m_EditorClassIdentifier: 
+  spriteList:
+  - {fileID: 21300000, guid: 313b0b672efa9fa4ca7745ad51f973dd, type: 3}
+  - {fileID: 21300000, guid: db1d18829278b4341829f6bfc6673cca, type: 3}
+  - {fileID: 21300000, guid: 731ff0e15dcd7694b8f8d74f0a9b5075, type: 3}
+  - {fileID: 21300000, guid: 779b8e237fd21604b9c6e67020a4a5fc, type: 3}
+  - {fileID: 21300000, guid: dd78b8f39b1a29a449dd0c3c3d76fe6e, type: 3}
+  - {fileID: 21300000, guid: e71c7420885d5e948bdf6e7926943744, type: 3}
+  - {fileID: 21300000, guid: e13cb5c9a7d0c1c4ea307adb983bdeed, type: 3}
+  - {fileID: 21300000, guid: 0b5464fbf36b4924fb338e5e0ffaa2da, type: 3}
+  - {fileID: 21300000, guid: f6d2606fa7142a640bfa80d9e5ce1eb0, type: 3}
+  - {fileID: 21300000, guid: 132d84bd9510b644189b993123381e5c, type: 3}
+  - {fileID: 21300000, guid: ce924937766dd0b42a5f6a673623ad25, type: 3}
+  - {fileID: 21300000, guid: dc58c8cc9aa241f4c957c11690313611, type: 3}
+  - {fileID: 21300000, guid: c898f5e6d9092d04aa3d67c656e0e35e, type: 3}
+  - {fileID: 21300000, guid: afaf31f05ff01454eb5c956881437bea, type: 3}
+  - {fileID: 21300000, guid: af43d5de4a8f700478f0786e88f11d31, type: 3}
+  - {fileID: 21300000, guid: a80b49f07eabcba498b49e4883aa73a9, type: 3}
+  - {fileID: 21300000, guid: 6ffc6a7502480d043a487eb0863b13db, type: 3}
+  - {fileID: 21300000, guid: ff3f0f1b31444814390965ec9859d901, type: 3}
+  - {fileID: 21300000, guid: d8c49ffe74671654c96547ae73ff7311, type: 3}
+  - {fileID: 21300000, guid: fe24f6280607e92499c60671e516e29e, type: 3}
+  - {fileID: 21300000, guid: 29e82cc364a9bff458e035358a980ef4, type: 3}
+  - {fileID: 21300000, guid: da1db79943762464fa510536d95b679a, type: 3}
+  - {fileID: 21300000, guid: e2c689d9860b10b4e849e5667479314a, type: 3}
+  - {fileID: 21300000, guid: c3b882d9e320d704c864748d6e182b58, type: 3}
+  - {fileID: 21300000, guid: 11b3e30a620bdab44a5a1d8db820a830, type: 3}
+  - {fileID: 21300000, guid: ab2031a24ccd6634898def83d64187cc, type: 3}
+  - {fileID: 21300000, guid: 3ab7a152f2a6d264890f6c3c8eaf54c2, type: 3}
+  - {fileID: 21300000, guid: fbcdedb68ec6d5d49b5c11225cb9820b, type: 3}
+  - {fileID: 21300000, guid: 430b9cf9134f1c44684532f1ae3f7714, type: 3}
+  - {fileID: 21300000, guid: feacdffaf71533a48834410c43f4f8a3, type: 3}
+  spriteNameList: 5c040a5a548736e7558736e75d040a5a5e040a5a5f040a5a60040a5a61040a5a62040a5a64040a5a535193015451930109ae3ce72fe251e70d031340c35e4dc20e0313400f031340100313401103134012031340130313401403134015031340e9644dc25cda876437575a1b38575a1be9d9551dead9551d

Assets/arts/atlas/ui/dungeon_armor.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e52ccef5bc605eb42a388042e20cd26b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/atlas/ui/dungeon_armor.spriteatlas

@@ -0,0 +1,127 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dungeon_armor
+  m_EditorData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 0
+      compressionQuality: 0
+      maxTextureSize: 0
+      textureCompression: 0
+      filterMode: 1
+      generateMipMaps: 0
+      readable: 0
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings:
+    - serializedVersion: 3
+      m_BuildTarget: Android
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 47
+      m_TextureCompression: 1
+      m_CompressionQuality: 50
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 3
+      m_BuildTarget: iPhone
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 50
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    packingSettings:
+      serializedVersion: 2
+      padding: 4
+      blockOffset: 0
+      allowAlphaSplitting: 0
+      enableRotation: 0
+      enableTightPacking: 0
+    secondaryTextureSettings: {}
+    variantMultiplier: 1
+    packables:
+    - {fileID: 102900000, guid: 236aec7ffbe88124d8af56404423d7cc, type: 3}
+    bindAsDefault: 1
+    isAtlasV2: 0
+    cachedData: {fileID: 0}
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites:
+  - {fileID: 21300000, guid: e71c7420885d5e948bdf6e7926943744, type: 3}
+  - {fileID: 21300000, guid: afaf31f05ff01454eb5c956881437bea, type: 3}
+  - {fileID: 21300000, guid: a80b49f07eabcba498b49e4883aa73a9, type: 3}
+  - {fileID: 21300000, guid: 731ff0e15dcd7694b8f8d74f0a9b5075, type: 3}
+  - {fileID: 21300000, guid: 3ab7a152f2a6d264890f6c3c8eaf54c2, type: 3}
+  - {fileID: 21300000, guid: db1d18829278b4341829f6bfc6673cca, type: 3}
+  - {fileID: 21300000, guid: ab2031a24ccd6634898def83d64187cc, type: 3}
+  - {fileID: 21300000, guid: 779b8e237fd21604b9c6e67020a4a5fc, type: 3}
+  - {fileID: 21300000, guid: 29e82cc364a9bff458e035358a980ef4, type: 3}
+  - {fileID: 21300000, guid: dd78b8f39b1a29a449dd0c3c3d76fe6e, type: 3}
+  - {fileID: 21300000, guid: 6ffc6a7502480d043a487eb0863b13db, type: 3}
+  - {fileID: 21300000, guid: fbcdedb68ec6d5d49b5c11225cb9820b, type: 3}
+  - {fileID: 21300000, guid: c898f5e6d9092d04aa3d67c656e0e35e, type: 3}
+  - {fileID: 21300000, guid: ce924937766dd0b42a5f6a673623ad25, type: 3}
+  - {fileID: 21300000, guid: 313b0b672efa9fa4ca7745ad51f973dd, type: 3}
+  - {fileID: 21300000, guid: fe24f6280607e92499c60671e516e29e, type: 3}
+  - {fileID: 21300000, guid: da1db79943762464fa510536d95b679a, type: 3}
+  - {fileID: 21300000, guid: e13cb5c9a7d0c1c4ea307adb983bdeed, type: 3}
+  - {fileID: 21300000, guid: c3b882d9e320d704c864748d6e182b58, type: 3}
+  - {fileID: 21300000, guid: e2c689d9860b10b4e849e5667479314a, type: 3}
+  - {fileID: 21300000, guid: 430b9cf9134f1c44684532f1ae3f7714, type: 3}
+  - {fileID: 21300000, guid: 11b3e30a620bdab44a5a1d8db820a830, type: 3}
+  - {fileID: 21300000, guid: feacdffaf71533a48834410c43f4f8a3, type: 3}
+  - {fileID: 21300000, guid: ff3f0f1b31444814390965ec9859d901, type: 3}
+  - {fileID: 21300000, guid: 0b5464fbf36b4924fb338e5e0ffaa2da, type: 3}
+  - {fileID: 21300000, guid: dc58c8cc9aa241f4c957c11690313611, type: 3}
+  - {fileID: 21300000, guid: 132d84bd9510b644189b993123381e5c, type: 3}
+  - {fileID: 21300000, guid: af43d5de4a8f700478f0786e88f11d31, type: 3}
+  - {fileID: 21300000, guid: d8c49ffe74671654c96547ae73ff7311, type: 3}
+  - {fileID: 21300000, guid: f6d2606fa7142a640bfa80d9e5ce1eb0, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - dungeon_armor_bg_4
+  - dungeon_armor_dec_1
+  - dungeon_armor_house_10
+  - dungeon_armor_bg_11
+  - dungeon_armor_road_1
+  - dungeon_armor_bg_10
+  - dungeon_armor_house_bg_2
+  - dungeon_armor_bg_2
+  - dungeon_armor_house_6
+  - dungeon_armor_bg_3
+  - dungeon_armor_house_2
+  - dungeon_armor_road_2
+  - dungeon_armor_btn_1
+  - dungeon_armor_board_1
+  - dungeon_armor_bg_1
+  - dungeon_armor_house_5
+  - dungeon_armor_house_7
+  - dungeon_armor_bg_5
+  - dungeon_armor_house_9
+  - dungeon_armor_house_8
+  - dungeon_armor_star_1
+  - dungeon_armor_house_bg
+  - dungeon_armor_star_2
+  - dungeon_armor_house_3
+  - dungeon_armor_bg_6
+  - dungeon_armor_board_2
+  - dungeon_armor_bg_9
+  - dungeon_armor_house_1
+  - dungeon_armor_house_4
+  - dungeon_armor_bg_7
+  m_RenderDataMap: {}
+  m_Tag: dungeon_armor
+  m_IsVariant: 0

Assets/arts/atlas/ui/dungeon_armor.spriteatlas.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b12f35a249cf79f449504ca426eac984
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/sounds/sfx/battle/34001200 1.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 8addb86174e6f274382e153ea2d59580
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 0
-    compressionFormat: 2
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 1
-  normalize: 1
-  preloadAudioData: 0
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: arts/sounds/sfx/battle/34001200 1.wav.ab
-  assetBundleVariant: 

Assets/arts/sounds/sfx/battle/34001200.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 91f51b860d4a16741be4cd87e2318af4
+guid: 8addb86174e6f274382e153ea2d59580
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: arts/sounds/sfx/battle/34001200.wav.ab
+  assetBundleName: arts/sounds/sfx/battle/34001200 1.wav.ab
   assetBundleVariant: 

Assets/prefabs/ui/dungeon_armor/dungeon_armor_star_reward_ui.prefab

@@ -330,6 +330,10 @@ MonoBehaviour:
     hashName: 2823790595
     objectType: 0
     gameObject: {fileID: 5682081041611724581}
+  - name: star_reward_cell.bg
+    hashName: 3852020942
+    objectType: 0
+    gameObject: {fileID: 6698288222421249243}
 --- !u!114 &7985081896378665032
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -442,6 +446,8 @@ GameObject:
   - component: {fileID: 7815926948094359597}
   - component: {fileID: 5997421634639954036}
   - component: {fileID: 4545619091535161499}
+  - component: {fileID: 1587740595097050177}
+  - component: {fileID: 2162795266037503537}
   m_Layer: 5
   m_Name: scrollrect
   m_TagString: Untagged
@@ -517,10 +523,38 @@ MonoBehaviour:
   topRecoveryOffset: 0
   downRecoveryOffset: 0
   direction: 0
-  reverse: 0
+  reverse: 1
   cellWidth: 588
   cellHeight: 138
   perLineNum: 1
+--- !u!222 &1587740595097050177
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2386366456196085431}
+  m_CullTransparentMesh: 1
+--- !u!114 &2162795266037503537
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2386366456196085431}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2465719363785051646
 GameObject:
   m_ObjectHideFlags: 0

Assets/proto/protocol.bytes

@@ -1,5 +1,5 @@
 
-ƒƒ
+ºƒ
 pb/proto/protocol.protocspb"ž

 Gift
 act_type
 
(RactType
@@ -376,21 +376,23 @@ trigger_at 
(R	triggerAt
 	expire_at 
(RexpireAt
 	cd_end_at 
(RcdEndAt"a
 ChapterArmorChallengeStartReq(
-chapter_Armor_id
 
(RchapterArmorId
+chapter_armor_id
 
(RchapterArmorId
 heroes (Rheroes"m
 ChapterArmorChallengeStartRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode"
 costs (2.cspb.RewardRcosts"c
 "ChapterArmorChallengeSettlementReq
 win
 
(Rwin+
-	task_stat 
(2.cspb.TaskStatRtaskStat"Æ

+	task_stat 
(2.cspb.TaskStatRtaskStat"ý

 "ChapterArmorChallengeSettlementRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode&
 rewards (2.cspb.RewardRrewards
 max_id 
(RmaxId7
-	gift_info 
(2.cspb.ChapterArmorGiftInfoRgiftInfo"H
+	gift_info 
(2.cspb.ChapterArmorGiftInfoRgiftInfo5
+
+armor_info 
(2.cspb.ChapterArmorInfoR	armorInfo"H
 ChapterArmorChallengeFarmReq(
-chapter_Armor_id
 
(RchapterArmorId"Í

+chapter_armor_id
 
(RchapterArmorId"Í

 ChapterArmorChallengeFarmRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode"
 costs (2.cspb.RewardRcosts&