战令

Assets/Scripts/Component/Helper/PrefabHelper.cs

@@ -361,6 +361,38 @@ namespace BF
             }
         }
 
+        public float GetRectWidth(int index)
+        {
+            RectTransform rectTransform = null;
+            if (index >= 0 && index < prefabList.Count)
+            {
+                rectTransform = prefabList[index].gameObject.transform as RectTransform;
+                return rectTransform.rect.width;
+            }
+            else if (index < 0)
+            {
+                rectTransform = this.transform as RectTransform;
+                return rectTransform.rect.width;
+            }
+            return 0.0f;
+        }
+
+        public float GetRectHeight(int index)
+        {
+            RectTransform rectTransform = null;
+            if (index >= 0 && index < prefabList.Count)
+            {
+                rectTransform = prefabList[index].gameObject.transform as RectTransform;
+                return rectTransform.rect.height;
+            }
+            else if (index < 0)
+            {
+                rectTransform = this.transform as RectTransform;
+                return rectTransform.rect.height;
+            }
+            return 0.0f;
+        }
+
         public void SetPosition(int index, float x, float y, float z)
         {
             if (index >= 0 && index < prefabList.Count)

Assets/XLua/Gen/BF_PrefabHelperWrap.cs

@@ -21,7 +21,7 @@ namespace XLua.CSObjectWrap
         {
 			ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
 			System.Type type = typeof(BF.PrefabHelper);
-			Utils.BeginObjectRegister(type, L, translator, 0, 39, 4, 1);
+			Utils.BeginObjectRegister(type, L, translator, 0, 41, 4, 1);
 			
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetGameObjectByName", _m_GetGameObjectByName);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetListCount", _m_GetListCount);
@@ -44,6 +44,8 @@ namespace XLua.CSObjectWrap
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "AddSizeDelta", _m_AddSizeDelta);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetSizeDelta", _m_GetSizeDelta);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "CacheSizeDelt", _m_CacheSizeDelt);
+			Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetRectWidth", _m_GetRectWidth);
+			Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetRectHeight", _m_GetRectHeight);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetPosition", _m_SetPosition);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "AddPosition", _m_AddPosition);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetLocalPosition", _m_SetLocalPosition);
@@ -729,6 +731,64 @@ namespace XLua.CSObjectWrap
             
         }
         
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _m_GetRectWidth(RealStatePtr L)
+        {
+		    try {
+            
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+            
+            
+                BF.PrefabHelper gen_to_be_invoked = (BF.PrefabHelper)translator.FastGetCSObj(L, 1);
+            
+            
+                
+                {
+                    int _index = LuaAPI.xlua_tointeger(L, 2);
+                    
+                        var gen_ret = gen_to_be_invoked.GetRectWidth( _index );
+                        LuaAPI.lua_pushnumber(L, gen_ret);
+                    
+                    
+                    
+                    return 1;
+                }
+                
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            
+        }
+        
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _m_GetRectHeight(RealStatePtr L)
+        {
+		    try {
+            
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+            
+            
+                BF.PrefabHelper gen_to_be_invoked = (BF.PrefabHelper)translator.FastGetCSObj(L, 1);
+            
+            
+                
+                {
+                    int _index = LuaAPI.xlua_tointeger(L, 2);
+                    
+                        var gen_ret = gen_to_be_invoked.GetRectHeight( _index );
+                        LuaAPI.lua_pushnumber(L, gen_ret);
+                    
+                    
+                    
+                    return 1;
+                }
+                
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            
+        }
+        
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
         static int _m_SetPosition(RealStatePtr L)
         {

Assets/arts/textures/background/bounty.meta

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

Assets/arts/textures/background/bounty/bounty_bg_9.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: b7272a3ad9656214986cf91d8261ffd8
+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: 0
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: arts/textures/background/bounty/bounty_bg_9.png.ab
+  assetBundleVariant: 

Assets/arts/textures/ui/common_temp/common_floor_16.png.meta

@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/textures/ui/common_temp.ab
+  assetBundleName: arts/textures/ui/common.ab
   assetBundleVariant: 

Assets/arts/textures/ui/common_temp/common_lock_2.png.meta

@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/textures/ui/common_temp.ab
+  assetBundleName: arts/textures/ui/common.ab
   assetBundleVariant: 

Assets/prefabs/ui/bounty/bounty_buy_ui.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 86a7053c9459a104ca8d536e7b2b7e58
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: prefabs/ui/bounty/bounty_buy_high_card_ui_3.prefab.ab
+  assetBundleVariant: 

Assets/prefabs/ui/common/message_box.prefab

@@ -134,6 +134,81 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &796314219863232056
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8169818512845020679}
+  - component: {fileID: 214906372554159580}
+  - component: {fileID: 8476784732338083800}
+  m_Layer: 0
+  m_Name: icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8169818512845020679
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 796314219863232056}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5535816440748046611}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 4}
+  m_SizeDelta: {x: 70, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &214906372554159580
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 796314219863232056}
+  m_CullTransparentMesh: 1
+--- !u!114 &8476784732338083800
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 796314219863232056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1352431187774359455
 GameObject:
   m_ObjectHideFlags: 0
@@ -195,13 +270,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3068702869260340252}
-  m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6412234626851302671}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
@@ -235,7 +310,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -275,6 +350,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 8169818512845020679}
   - {fileID: 2479030491461019998}
   m_Father: {fileID: 4002258812364763181}
   m_RootOrder: 4
@@ -574,13 +650,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5535816440748046611}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -25}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 4}
   m_SizeDelta: {x: 196, y: 40}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3987240109532777124
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1027,7 +1103,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1265,6 +1341,10 @@ MonoBehaviour:
     hashName: 930375805
     objectType: 0
     gameObject: {fileID: 300109638638985350}
+  - name: message_box.title_bg_img.ok_btn.icon
+    hashName: 3773070187
+    objectType: 0
+    gameObject: {fileID: 796314219863232056}
 --- !u!1 &7884661295923494243
 GameObject:
   m_ObjectHideFlags: 0

Assets/prefabs/ui/common/reward_cell.prefab

@@ -39,7 +39,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 130, y: 130}
+  m_SizeDelta: {x: 120, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6411314692120023450
 CanvasRenderer:
@@ -114,7 +114,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 130, y: 130}
+  m_SizeDelta: {x: 120, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2042954304608953024
 CanvasRenderer:
@@ -137,7 +137,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.9411765}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -264,7 +264,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 130, y: 130}
+  m_SizeDelta: {x: 120, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8844624823740129944
 CanvasRenderer:
@@ -338,7 +338,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 49, y: 51}
+  m_AnchoredPosition: {x: 44, y: 46}
   m_SizeDelta: {x: 40, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2123021332735512846
@@ -413,13 +413,14 @@ RectTransform:
   m_Children:
   - {fileID: 5993802040676866955}
   - {fileID: 3229962652627218785}
+  - {fileID: 6232112434002766485}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 130, y: 130}
+  m_SizeDelta: {x: 120, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7145656218889782844
 MonoBehaviour:
@@ -458,6 +459,10 @@ MonoBehaviour:
     hashName: 2860980393
     objectType: 0
     gameObject: {fileID: 4940665596048500704}
+  - name: reward_cell.frame_ani
+    hashName: 4246067598
+    objectType: 0
+    gameObject: {fileID: 6779517126958811877}
 --- !u!225 &6876715644725703649
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -511,6 +516,101 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   IsShowClickAnimation: 1
+--- !u!1 &6779517126958811877
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6232112434002766485}
+  - component: {fileID: 2744429620608553910}
+  - component: {fileID: 3921200856729497661}
+  - component: {fileID: 2583661744110203518}
+  m_Layer: 5
+  m_Name: frame_ani
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6232112434002766485
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6779517126958811877}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 2568998946116628564}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -2}
+  m_SizeDelta: {x: 148, y: 148}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2744429620608553910
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6779517126958811877}
+  m_CullTransparentMesh: 1
+--- !u!114 &3921200856729497661
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6779517126958811877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: -9179072318096453296, guid: b7253c25a8f613d4f8c4b5b55ad83221, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!95 &2583661744110203518
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6779517126958811877}
+  m_Enabled: 0
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 49d979a7eba47f9439d661256bd2bae6, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &7935477523361362109
 GameObject:
   m_ObjectHideFlags: 0
@@ -545,7 +645,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -16, y: 16}
+  m_AnchoredPosition: {x: -16, y: 11}
   m_SizeDelta: {x: 89, y: 31}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &2899151997899005891

Assets/proto/protocol.bytes

@@ -1,5 +1,5 @@
 
-£g
+Žv
 pb/proto/protocol.protocspb"ž

 Gift
 act_type
 
(RactType
@@ -104,8 +104,9 @@ proClaimed:
 is_pro 
(RisPro"c
 BountyRewardRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode&
-rewards (2.cspb.RewardRrewards"
-BountyBoughtNtf"D
+rewards (2.cspb.RewardRrewards"'
+BountyBoughtNtf
+level
 
(Rlevel"D
 ChapterInfo
 total_count
 
(R
 totalCount
@@ -209,7 +210,26 @@ chapter_id
 
(R	chapterId
 heroes (2.cspb.HeroPutOnRsp.HeroesEntryRheroes9
 HeroesEntry
 key
 
(Rkey
-value 
(Rvalue:8
"¶

+value 
(Rvalue:8
"<22>

+Idle$
+gold_drop_time
 
(RgoldDropTime$
+item_drop_time 
(RitemDropTime
+ad_count 
(RadCount!
+energy_count 
(RenergyCount"
+
IdleRewardReq"­

+
IdleRewardRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode$
+gold_drop_time 
(RgoldDropTime$
+item_drop_time 
(RitemDropTime&
+rewards (2.cspb.RewardRrewards"
+IdleQuickReq
+ad
 
(Rad"Â

+IdleQuickRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode
+ad_count 
(RadCount!
+energy_count 
(RenergyCount&
+rewards (2.cspb.RewardRrewards"
+costs (2.cspb.RewardRcosts"¶

 Mail
 id
 
(Rid
 title 
(	Rtitle
@@ -243,7 +263,32 @@ chapter_id
 
(R	chapterId
 err_code
 
(2
.cspb.ErrCodeRerrCode
 ids (Rids"
 
-NewMailNtf"u
+NewMailNtf"‡

+	MallDaily$
+ad_reset_Count
 
(RadResetCount.
+diamond_reset_Count 
(RdiamondResetCount$
+goods (2.cspb.GoodInfoRgoods"Q
+GoodInfo
+id
 
(Rid
+
+good_index 
(R	goodIndex
+bought 
(Rbought"!
+BuyMallDailyReq
+id
 
(Rid"´

+BuyMallDailyRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode+
+	good_info 
(2.cspb.GoodInfoRgoodInfo&
+rewards (2.cspb.RewardRrewards"
+costs (2.cspb.RewardRcosts"2
+MallDailyResetReq
+
+reset_type
 
(R	resetType"š

+MallDailyResetRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode7
+mall_daily_info 
(2.cspb.MallDailyR
mallDailyInfo"
+costs (2.cspb.RewardRcosts"L
+MallDailyResetNtf7
+mall_daily_info
 
(2.cspb.MallDailyR
mallDailyInfo"u
 Pig
 
 current_id
 
(R	currentId
@@ -359,7 +404,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
@@ -386,7 +431,10 @@ task_daily 
(2.cspb.TaskDailyR	taskDaily+
 pig 
(2	.cspb.PigRpig4
 energy_limit 
(2.cspb.EnergyLimitRenergyLimit<
 act_grow_up_gift 
(2.cspb.ActGrowUpGiftR
actGrowUpGift?
-act_level_up_gift 
(2.cspb.ActLevelUpGiftRactLevelUpGift"U
+act_level_up_gift 
(2.cspb.ActLevelUpGiftRactLevelUpGift$
+summon 
(2.cspb.SummonRsummon
+idle 
(2
+.cspb.IdleRidle"U
 PipedReq
 id
 
(
Rid
 ts 
(Rts
@@ -407,7 +455,24 @@ KickOutNtf+
 WatchADReq"6
 
 WatchADRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode"R
+err_code
 
(2
.cspb.ErrCodeRerrCode"
+
+LevelUpReq"†

+
+LevelUpRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode
+level 
(Rlevel
+exp 
(Rexp&
+rewards (2.cspb.RewardRrewards"0
+Summon
+level
 
(Rlevel
+exp 
(Rexp"
+	SummonReq
+type
 
(Rtype"d
+	SummonRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode-
+summon_info 
(2.cspb.SummonR
+summonInfo"R
 
 TaskSingle
 id
 
(Rid
@@ -446,12 +511,11 @@ TasksEntry
 TaskDailyRewardRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode'
 task 
(2.cspb.TaskDailyTaskRtask&
-rewards (2.cspb.RewardRrewards"·
+rewards (2.cspb.RewardRrewards"š
 SevenDay
-open_day_ts
 
(R	openDayTs
-	login_day 
(RloginDay/
-tasks (2.cspb.SevenDay.TasksEntryRtasks5
-claimed (2.cspb.SevenDay.ClaimedEntryRclaimedJ
+open_day_ts
 
(R	openDayTs/
+tasks (2.cspb.SevenDay.TasksEntryRtasks5
+claimed (2.cspb.SevenDay.ClaimedEntryRclaimedJ
 
 TasksEntry
 key
 
(Rkey&
@@ -477,7 +541,7 @@ TasksEntry
 rewards (2.cspb.RewardRrewards:
 ClaimedEntry
 key
 
(Rkey
-value 
(Rvalue:8
*Ï
+value 
(Rvalue:8
*œ
 ErrCode
 SUCCESS
 
@@ -519,8 +583,14 @@ TasksEntry
 ACT_PAY_GIFT_NOT_TRIGGERî"
 ACT_PAY_FIRST_PAY_NOT_SATISFYï
 ACT_PAY_DUPLICATEð!
-ACT_PAY_GROWUP_GIFT_NOT_NEXTñ
-
IDLE_EXTRA_CDÌ
+ACT_PAY_GROWUP_GIFT_NOT_NEXTñ 
+ACT_PAY_FREE_TREASURE_LIMITò
+ACT_PAY_MALL_DAILY_LIMITó
+ACT_PAY_MALL_DAILY_RESETô&
+!ACT_PAY_MALL_DAILY_AD_RESET_LIMITõ+
+&ACT_PAY_MALL_DAILY_DIAMOND_RESET_LIMITö
+
IDLE_AD_LIMITÌ
+IDLE_ENERGY_LIMITÍ
 FUND_HAS_AWARDED°	
 FUND_NOT_SATISFIED±	
 FUND_STAGE1_UNFINISHED²