装备升级礼包

Assets/arts/atlas/ui/common.asset

@@ -103,6 +103,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 33eb4a26b60c789498ae5382b6b6251b, type: 3}
   - {fileID: 21300000, guid: 13b1668a707250d4cac750f73ca8f3c3, type: 3}
   - {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3}
+  - {fileID: 21300000, guid: bd8ab060d4c962f45b3af7dea9c8ee79, type: 3}
   - {fileID: 21300000, guid: bbc8dc8d2ae3e364990b159c9a7ef3df, type: 3}
   - {fileID: 21300000, guid: f65bbb56e45988348b8aeb0272f58047, type: 3}
   - {fileID: 21300000, guid: 15a10479bd4a42c459af0778f0f3c004, type: 3}
@@ -173,4 +174,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3}
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
   - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
-  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8d8e243e8d8f243e8d90243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f49782ef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f34973970349739713497397234973973349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb6958aa025459aa0254a15c468d14c42155b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158
+  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8d8e243e8d8f243e8d90243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f49782ef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f34973970349739713497397234973973349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb6958aa025459aa0254a15c468d14c42155b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158

Assets/arts/atlas/ui/common.spriteatlas

@@ -62,6 +62,7 @@ SpriteAtlas:
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: bdcabd5093d701f498daa8906bfd6eb3, type: 3}
+  - {fileID: 21300000, guid: bd8ab060d4c962f45b3af7dea9c8ee79, type: 3}
   - {fileID: 21300000, guid: fab2da6010f11704a98a2f788ba73a34, type: 3}
   - {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3}
   - {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3}
@@ -223,6 +224,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3}
   m_PackedSpriteNamesToIndex:
   - common_board_24
+  - common_circle_1
   - common_title_12
   - common_title_2
   - common_title_1

Assets/arts/spines/ui/ui_main_btn_equipgift/ui_main_btn_equipgift.atlas.txt

@@ -1,31 +0,0 @@
-ui_main_btn_equipgift.png
-size:128,128
-filter:Linear,Linear
-daizi
-bounds:2,75,87,51
-hou
-bounds:2,3,70,22
-offsets:1,1,72,24
-rotate:90
-jinzhuan
-bounds:26,40,41,33
-offsets:1,1,43,35
-tou
-bounds:91,3,78,31
-rotate:90
-xian1
-bounds:26,5,23,30
-xian2
-bounds:51,9,16,29
-xx1
-bounds:69,56,17,18
-offsets:1,1,19,20
-rotate:90
-xx2
-bounds:69,37,17,18
-offsets:1,1,19,20
-rotate:90
-yinzhuan
-bounds:91,83,43,35
-offsets:1,1,45,37
-rotate:90

Assets/arts/spines/ui/ui_main_btn_weapongift/ui_main_btn_weapongift.atlas.txt

@@ -1,26 +0,0 @@
-ui_main_btn_weapongift.png
-size:256,256
-filter:Linear,Linear
-daizi
-bounds:2,151,87,51
-hou
-bounds:91,180,70,22
-offsets:1,1,72,24
-jinzhuan
-bounds:2,22,40,45
-tou
-bounds:2,118,78,31
-xian1
-bounds:91,155,23,30
-rotate:90
-xian2
-bounds:163,186,16,29
-rotate:90
-xx1
-bounds:45,98,17,18
-offsets:1,1,19,20
-xx2
-bounds:2,2,17,18
-offsets:1,1,19,20
-yinzhuan
-bounds:2,69,41,47

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift.atlas.txt

@@ -0,0 +1,35 @@
+ui_main_equipgift.png
+size:256,256
+filter:Linear,Linear
+cl1
+bounds:206,216,38,41
+offsets:1,1,40,43
+rotate:90
+cl2
+bounds:1,1,34,39
+offsets:1,1,36,41
+rotate:90
+cl3
+bounds:1,37,40,41
+offsets:1,1,42,43
+g1
+bounds:1,80,69,63
+offsets:2,1,73,66
+g2
+bounds:1,201,109,53
+offsets:2,1,113,56
+xiang1
+bounds:112,217,92,37
+offsets:1,1,94,39
+xiang2
+bounds:1,145,88,54
+offsets:1,1,90,56
+xx1
+bounds:91,149,23,23
+offsets:2,2,27,27
+xx2
+bounds:43,50,28,28
+offsets:2,2,32,32
+xx3
+bounds:91,174,25,25
+offsets:2,2,29,29

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift.atlas.txt.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 4c50e0e2bdd3efb4e9627b5d7b9f2b86
+guid: c6f751b216429f644b7b15dff8fdd6a6
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_equipgift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4cd540920a2e38143877140f686ad65f
+guid: f3a73f474b997794eb251d2808f932cf
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_equipgift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift.skel.bytes.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: c138eb52a0e230a428819a00a4c2bb07
+guid: 9ccc1ab1612a6014fb3210615c868559
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_equipgift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift_atlas.asset

@@ -10,8 +10,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: ui_main_btn_equipgift_atlas
+  m_Name: ui_main_equipgift_atlas
   m_EditorClassIdentifier: 
-  atlasFile: {fileID: 4900000, guid: c138eb52a0e230a428819a00a4c2bb07, type: 3}
+  atlasFile: {fileID: 4900000, guid: c6f751b216429f644b7b15dff8fdd6a6, type: 3}
   materials:
-  - {fileID: 2100000, guid: a6c076e10e0dc8f40884a07232a27f2b, type: 2}
+  - {fileID: 2100000, guid: 22c64d680e90d784ca63af3fe2e38d26, type: 2}

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift_atlas.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 3bed7524afb6d50468c7c2b3dfb987df
+guid: c1a76526b68266942b5c200f99ebdd8d
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_equipgift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift_material.mat

@@ -7,9 +7,9 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: ui_main_btn_equipgift_material
+  m_Name: ui_main_equipgift_material
   m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
-  m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON
+  m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -20,7 +20,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 4cd540920a2e38143877140f686ad65f, type: 3}
+        m_Texture: {fileID: 2800000, guid: f3a73f474b997794eb251d2808f932cf, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
@@ -32,7 +32,7 @@ Material:
     - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilRef: 1
-    - _StraightAlphaInput: 0
+    - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
     m_Colors:

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift_material.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: a6c076e10e0dc8f40884a07232a27f2b
+guid: 22c64d680e90d784ca63af3fe2e38d26
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_equipgift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift_skeletondata.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: ui_main_btn_equipgift_skeletondata
+  m_Name: ui_main_equipgift_skeletondata
   m_EditorClassIdentifier: 
   atlasAssets:
-  - {fileID: 11400000, guid: bb040c3c59fb79643ba3d2259ff4c555, type: 2}
+  - {fileID: 11400000, guid: c1a76526b68266942b5c200f99ebdd8d, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: 4c50e0e2bdd3efb4e9627b5d7b9f2b86, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: 9ccc1ab1612a6014fb3210615c868559, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0

Assets/arts/spines/ui/ui_main_equipgift/ui_main_equipgift_skeletondata.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: bb040c3c59fb79643ba3d2259ff4c555
+guid: 7bab5c941a558794c963dfda47d2699e
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_equipgift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon.atlas.txt

@@ -0,0 +1,34 @@
+ui_main_weapon.png
+size:256,256
+filter:Linear,Linear
+cl1
+bounds:91,157,38,36
+offsets:0,1,38,37
+rotate:90
+cl2
+bounds:206,216,34,41
+offsets:0,0,35,41
+rotate:90
+cl3
+bounds:1,31,53,43
+g1
+bounds:1,76,69,63
+offsets:2,1,73,66
+g2
+bounds:1,197,109,53
+offsets:2,1,113,56
+xiang1
+bounds:112,213,92,37
+offsets:1,1,94,39
+xiang2
+bounds:1,141,88,54
+offsets:1,1,90,56
+xx1
+bounds:72,116,23,23
+offsets:2,2,27,27
+xx2
+bounds:1,1,28,28
+offsets:2,2,32,32
+xx3
+bounds:31,4,25,25
+offsets:2,2,29,29

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon.atlas.txt.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 2cdd3e2d117fd544185018a203b8353a
+guid: 24c678431f6b52249905890d56a4518b
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_weapongift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d67a3bc4d4ef3294a9e239cdd4eee46f
+guid: fcdf6758fff4a7044a3739abfb1b7876
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_weapongift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon.skel.bytes.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: b0c235be0435ee845bd9488b4bc6d1a2
+guid: 49d0b047bb029424285b7f4662f927c0
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_weapongift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon_atlas.asset

@@ -10,8 +10,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: ui_main_btn_weapongift_atlas
+  m_Name: ui_main_weapon_atlas
   m_EditorClassIdentifier: 
-  atlasFile: {fileID: 4900000, guid: 2cdd3e2d117fd544185018a203b8353a, type: 3}
+  atlasFile: {fileID: 4900000, guid: 24c678431f6b52249905890d56a4518b, type: 3}
   materials:
-  - {fileID: 2100000, guid: f24e7c3d92586904e925fa7975f85a4e, type: 2}
+  - {fileID: 2100000, guid: 8aa24560eccc5424b9f0c9170115d3f2, type: 2}

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon_atlas.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: cefa5b7ab06f04d4fb03f3f290ad8563
+guid: ff8dc81fa653cb447afbcac01cf127fc
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_weapongift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon_material.mat

@@ -7,9 +7,9 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: ui_main_btn_weapongift_material
+  m_Name: ui_main_weapon_material
   m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
-  m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON
+  m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -20,7 +20,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: d67a3bc4d4ef3294a9e239cdd4eee46f, type: 3}
+        m_Texture: {fileID: 2800000, guid: fcdf6758fff4a7044a3739abfb1b7876, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
@@ -32,7 +32,7 @@ Material:
     - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilRef: 1
-    - _StraightAlphaInput: 0
+    - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
     m_Colors:

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon_material.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f24e7c3d92586904e925fa7975f85a4e
+guid: 8aa24560eccc5424b9f0c9170115d3f2
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_weapongift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon_skeletondata.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: ui_main_btn_weapongift_skeletondata
+  m_Name: ui_main_weapon_skeletondata
   m_EditorClassIdentifier: 
   atlasAssets:
-  - {fileID: 11400000, guid: cefa5b7ab06f04d4fb03f3f290ad8563, type: 2}
+  - {fileID: 11400000, guid: ff8dc81fa653cb447afbcac01cf127fc, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: b0c235be0435ee845bd9488b4bc6d1a2, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: 49d0b047bb029424285b7f4662f927c0, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0

Assets/arts/spines/ui/ui_main_weapon/ui_main_weapon_skeletondata.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: a3de737f0ab972a46b4ac1b1db646011
+guid: 957e5c66c25043f4fba0a7d2799cafac
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/ui/ui_main_btn_weapongift.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/textures/background/shop/shop_gift_banner_7_1.png.meta

@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/textures/background/shop/shop_gift_banner_7_1.png.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/textures/background/shop/shop_gift_banner_7_2.png.meta

@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/textures/background/shop/shop_gift_banner_7_2.png.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/textures/background/shop/shop_gift_banner_8_1.png.meta

@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/textures/background/shop/shop_gift_banner_8_1.png.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/textures/background/shop/shop_gift_banner_8_2.png.meta

@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/textures/background/shop/shop_gift_banner_8_2.png.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/textures/background/shop/shop_gift_bg_3.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 3b2d25525d55b4c4ea33669ccda5dc9c
+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: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  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: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: bd8ab060d4c962f45b3af7dea9c8ee79
+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
@@ -130,13 +130,15 @@ trigger_at 
(R	triggerAt"d
 TriggerGoldGiftReq 
 gold_gift_id
 
(R
 goldGiftId"
-TriggerGoldGiftRsp"V
-ActWeaponArmorGift!
-current_gift
 
(RcurrentGift
-
-trigger_at 
(R	triggerAt"B
-TriggerWeaponArmorGiftReq%
-equip_position
 
(R
equipPosition"I
+TriggerGoldGiftRsp"¢

+ActWeaponArmorGiftL
+active_gifts
 (2).cspb.ActWeaponArmorGift.ActiveGiftsEntryRactiveGifts>
+ActiveGiftsEntry
+key
 
(Rkey
+value 
(Rvalue:8
"[
+TriggerWeaponArmorGiftReq
+hero_id
 
(RheroId%
+equip_position 
(R
equipPosition"I
 TriggerWeaponArmorGiftRsp,
 info
 
(2.cspb.ActWeaponArmorGiftRinfo"
 AIHelpUnreadReq";
@@ -973,7 +975,7 @@ facebookId"C
 client_info
 
(2.cspb.ClientInfoR
 clientInfo
 
-skip_guide 
(R	skipGuide"Ä
+skip_guide 
(R	skipGuide"‘
 LoginRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode*
 today_first_login 
(RtodayFirstLogin
@@ -1021,7 +1023,8 @@ mall_daily 
(2.cspb.MallDailyR	mallDaily+
 collection$ 
(2.cspb.CollectionR
 collection!
 game_version% 
(	RgameVersion+
-	hero_fund& 
(2.cspb.HeroFundRheroFund"U
+	hero_fund& 
(2.cspb.HeroFundRheroFundK
+act_weapon_armor_gift' 
(2.cspb.ActWeaponArmorGiftRactWeaponArmorGift"U
 PipedReq
 id
 
(
Rid
 ts 
(Rts