Merge branch 'arena_bounty' into arena

Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs

@@ -269,6 +269,11 @@ namespace BFEditor.Build
 			if(buildInfo.IsDevChannel())
 			{
 				MergeProject(buildInfo, DevAsProjectPath);
+				var dir = Path.Combine(Application.dataPath, "../", AS_PROJECT_PATH, buildInfo.mode);
+				BFEditorUtils.RunCommond("gradle", " assembleDebug", dir, (msg) => {
+				}, (errorMsg) => {
+					Debug.LogError("[bferror] " + errorMsg);
+				});
 			}
 			else if(buildInfo.IsLanRelease())
 			{

Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs

@@ -20,13 +20,14 @@ namespace BFEditor
         // }
         const string BOARD_EXCEL_KEY = "bf_board_excel_key";
         const string BOARD_GRID_TYPE_KEY = "bf_board_grid_type_key";
-        const int gridCount = 49;
+        int gridCount = 49;
         string battleImgDirectory = "Assets/arts/textures/ui/battle/";
         string boardFilepath;
         string boardGridTypePath;
         string boardFiledName = "board";
         string randomTypeStr = "";
         int curIndex = 1;
+        int maxRow = 7;
         Dictionary<int, Dictionary<string, string>> boardGridTypeDict = new Dictionary<int, Dictionary<string, string>>();
         Dictionary<int, JArray> boardDict = new Dictionary<int, JArray>();
         Dictionary<int, JArray> outPutBoardDict = new Dictionary<int, JArray>();
@@ -138,11 +139,17 @@ namespace BFEditor
             GUILayout.EndHorizontal();
 
             GUILayout.Space(10);
+            GUILayout.BeginHorizontal();
             if (GUILayout.Button("加载棋盘", GUILayout.Width(80)))
             {
                 LoadBoardExcel();
             }
 
+            GUILayout.Label("棋盘数量", GUILayout.Width(100));
+            gridCount = int.Parse(GUILayout.TextField(gridCount.ToString(), GUILayout.Width(200)));
+            maxRow = (int)(gridCount / 7);
+
+            GUILayout.EndHorizontal();
             GUILayout.BeginHorizontal();
             if (!IsInNewBoard())
             {
@@ -275,8 +282,7 @@ namespace BFEditor
                 JArray ja = new JArray();
                 for (int i = 0; i < gridCount; i++)
                 {
-                    JArray unit = (JArray)JsonConvert.DeserializeObject("[0, 0]");
-                    ja.Add(unit);
+                    ja.Add(getNewGridUnitInfo());
                 }
                 foreach (int gridType in dict.Keys)
                 {
@@ -347,7 +353,6 @@ namespace BFEditor
                 foreach (var item2 in (JObject)item.Value)
                 {
                     dict[item2.Key] = item2.Value.ToString();
-                    Debug.Log(item2.Key);
                 }
                 boardGridTypeDict[key] = dict;
             }
@@ -394,8 +399,8 @@ namespace BFEditor
             {
                 return;
             }
-            int startOffset = 22;
-            int textureWidth = 94;
+            int startOffset = 22 * 7 / maxRow;
+            int textureWidth = 94 * 7 / maxRow;
             if (!boardDict.ContainsKey(curIndex))
             {
                 return;
@@ -405,9 +410,13 @@ namespace BFEditor
             GUILayout.BeginVertical();
             JArray jo = boardDict[curIndex];
             int posIndex = 0;
-            for (int row = 1; row <= 7; row++) {
+            for (int row = 1; row <= maxRow; row++) {
                 GUILayout.BeginHorizontal();
                 for (int col = 1; col <= 7; col++) {
+                    if (jo.Count == posIndex)
+                    {
+                        jo.Add(getNewGridUnitInfo());
+                    }
                     JArray gridInfo = (JArray)jo[posIndex];
                     if(gridInfo.Count < 2)
                     {
@@ -445,14 +454,14 @@ namespace BFEditor
             GUILayout.EndVertical();
             GUILayout.EndArea();
 
-            GUILayout.BeginArea(new Rect(730, 150, 510, 550));
+            GUILayout.BeginArea(new Rect(730, 150, 510 * 7, 550 / 7 * maxRow));
             GUILayout.BeginVertical();
             GUILayout.BeginHorizontal();
             GUILayout.Label("棋盘配置信息", GUILayout.Width(100), GUILayout.Height(30));
             GUILayout.EndHorizontal();
 
             posIndex = 0;
-            for (int row = 1; row <= 7; row++) {
+            for (int row = 1; row <= maxRow; row++) {
                 GUILayout.BeginHorizontal();
                 for (int col = 1; col <= 7; col++) {
                     JArray gridInfo = (JArray)jo[posIndex];
@@ -580,5 +589,10 @@ namespace BFEditor
             }
             return !outPutBoardDict.ContainsKey(curIndex);
         }
+
+        JArray getNewGridUnitInfo()
+        {
+            return (JArray)JsonConvert.DeserializeObject("[0, 0]");
+        }
     }
 }

Assets/Editor/JenkinsAdapter.cs

@@ -11,49 +11,17 @@ public class JenkinsAdapter {
     /// 构建版本号
     /// </summary>
     private static string BuildVersion = (int.Parse(DateTime.Now.ToString("yyMMddHH"))).ToString();
-    private static bool _oldShowSplash = false;
-
-    /// <summary>
-    /// 通用设置
-    /// </summary>
-    private static bool CommonSetting(BuildTargetGroup target) {
-
-        _oldShowSplash = PlayerSettings.SplashScreen.show;
-        //去掉Unity的SplashScreen
-        PlayerSettings.SplashScreen.show = false;
-        return true;
-    }
-
-    private static void BuildAddressable(BuildTargetGroup target, BuildTarget buildTarget) {
-        // EditorUserBuildSettings.SwitchActiveBuildTarget(target, buildTarget);
-        // AddressableEditor.BuildContent();
-    }
-
-    //设置还原
-    private static void recover(BuildTargetGroup target) {
-        PlayerSettings.SplashScreen.show = _oldShowSplash;
-
-        AssetDatabase.SaveAssets();
-        AssetDatabase.Refresh();
-    }
-
-    //打包 app bundle 
+    private static int versionCode = 3;
+    private static string versionName = "0.1.0";
 
     [MenuItem("Jenkins/JenkinsBuildIos")]
     public static void CommandLineBuildIos() {
-        //打包
-        if(!CommonSetting(BuildTargetGroup.iOS)){
-            return;
-        };
-        BuildAddressable(BuildTargetGroup.iOS, BuildTarget.iOS);
-
         var buildInfo = new BuildInfo();
-        buildInfo.version = "0.1.0";
+        buildInfo.version = versionName;
         buildInfo.mode = "publish_release";
         buildInfo.bundleName = "com.combo.heroes.puzzle.rpg";
         buildInfo.skipVersion = false;
         BuildProjectTools.BuildResources(buildInfo, Application.streamingAssetsPath, true);
-
         // 重新生成XLua
 	    CompileScriptsUtils.RegenerateXLuaCode(true);
 
@@ -62,25 +30,21 @@ public class JenkinsAdapter {
         //Jenkins要求自动构建最低ios8.0
         PlayerSettings.iOS.targetOSVersionString = "12.0";
         //设置Build，每次需要增加
-        PlayerSettings.iOS.buildNumber = "2";
+        PlayerSettings.iOS.buildNumber = versionCode.ToString();
         // 隐藏ios的横条
-        PlayerSettings.iOS.hideHomeButton = true;
+        PlayerSettings.iOS.hideHomeButton = false;
         // 禁止在所有边缘上延迟手势
         PlayerSettings.iOS.deferSystemGesturesMode = UnityEngine.iOS.SystemGestureDeferMode.All;
-
         // 设置竖屏
         PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait;
         PlayerSettings.allowedAutorotateToPortrait = false;
         PlayerSettings.allowedAutorotateToPortraitUpsideDown = false;
         PlayerSettings.allowedAutorotateToLandscapeLeft = false;
         PlayerSettings.allowedAutorotateToLandscapeRight = false;
-
         // 关闭启动动画
         PlayerSettings.SplashScreen.show = false;
-
         // 设置包名
         PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.iOS, buildInfo.bundleName);
-
         // 是否跳过版本控制
         var symbols = "THREAD_SAFE;USE_AB";
         if (buildInfo.skipVersion)
@@ -89,20 +53,19 @@ public class JenkinsAdapter {
         }
         PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.iOS, symbols);
         // 商品名称
-         PlayerSettings.productName = "Knights Combo";
+        PlayerSettings.productName = "Knights Combo";
         // BuildType设置dev/release
         EditorUserBuildSettings.iOSBuildConfigType = iOSBuildType.Release;
+        EditorUserBuildSettings.development = false;
         // 使用IL2CPP
         var scriptImp = ScriptingImplementation.IL2CPP;
         PlayerSettings.SetScriptingBackend(BuildTargetGroup.iOS, scriptImp);
         // 目标平台架构，目前支持ARM64
         PlayerSettings.SetArchitecture(BuildTargetGroup.iOS, 1);
-        EditorUserBuildSettings.development = false;
 
+        // 开始打包
         BuildPipeline.BuildPlayer(GetBuildScenes(), GetIosBuildPath(), BuildTarget.iOS, BuildOptions.None);
         Console.WriteLine("Build Complete Path:" + GetIosBuildPath());
-
-        recover(BuildTargetGroup.iOS);
     }
 
 

Assets/Editor/Package.cs

@@ -108,7 +108,7 @@ public class Package {
         // project.SetBuildProperty(targetGuid, "USYM_UPLOAD_AUTH_TOKEN", "FakeToken");
         // project.SetBuildProperty(targetGuid_Framework, "USYM_UPLOAD_AUTH_TOKEN", "FakeToken");
         //ITMS-90206，UnityFramework包含Framework问题
-        // project.SetBuildProperty(targetGuid_Framework, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "NO");
+        project.SetBuildProperty(targetGuid_Framework, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "NO");
 
         project.WriteToFile(configFilePath);
 

Assets/prefabs/effects/battle/sfx_skill_b01.prefab

@@ -4841,7 +4841,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -9708,7 +9708,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -14575,7 +14575,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -19442,7 +19442,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -24309,7 +24309,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -29127,7 +29127,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -33994,7 +33994,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -38870,7 +38870,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -48610,7 +48610,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

Assets/prefabs/effects/battle/sfx_skill_b01_1.prefab

@@ -4841,7 +4841,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -14581,7 +14581,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -19448,7 +19448,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -24266,7 +24266,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -29133,7 +29133,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -34009,7 +34009,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -38876,7 +38876,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -43743,7 +43743,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -48610,7 +48610,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

Assets/prefabs/effects/battle/sfx_skill_b01_2.prefab

@@ -4841,7 +4841,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -9708,7 +9708,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -14584,7 +14584,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -19451,7 +19451,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -24269,7 +24269,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -29136,7 +29136,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -34003,7 +34003,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -38870,7 +38870,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -48610,7 +48610,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

Assets/prefabs/effects/battle/sfx_skill_b02.prefab

@@ -4841,7 +4841,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -9717,7 +9717,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -19451,7 +19451,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

Assets/prefabs/effects/battle/sfx_skill_b03.prefab

@@ -4841,7 +4841,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -9708,7 +9708,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -19442,7 +19442,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

Assets/prefabs/effects/battle/sfx_skill_b04.prefab

@@ -4841,7 +4841,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -9708,7 +9708,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

Assets/prefabs/effects/battle/sfx_skill_b05.prefab

@@ -4841,7 +4841,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -9717,7 +9717,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0
@@ -19396,7 +19396,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 50
+  m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

Assets/prefabs/ui/arena.meta

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

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

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

Assets/prefabs/ui/arena/bounty_main_ui.prefab.meta

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

Assets/prefabs/ui/arena/cell.meta

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

Assets/prefabs/ui/arena/cell/bounty_reward_cell.prefab

@@ -0,0 +1,887 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &218819111413039857
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5993802040676866955}
+  - component: {fileID: 6411314692120023450}
+  - component: {fileID: 5627371511802767576}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5993802040676866955
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 218819111413039857}
+  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: 2568998946116628564}
+  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: 156, y: 152}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6411314692120023450
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 218819111413039857}
+  m_CullTransparentMesh: 1
+--- !u!114 &5627371511802767576
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 218819111413039857}
+  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: 129dd3d736ed34c4fad5b31566a74c30, type: 3}
+  m_Type: 1
+  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 &1046539501109734236
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2631456693477493767}
+  - component: {fileID: 1028275580766577710}
+  - component: {fileID: 5779668682805317886}
+  m_Layer: 5
+  m_Name: lock
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2631456693477493767
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1046539501109734236}
+  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: 2568998946116628564}
+  m_RootOrder: 5
+  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: 63, y: 62}
+  m_SizeDelta: {x: 42, y: 49}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1028275580766577710
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1046539501109734236}
+  m_CullTransparentMesh: 1
+--- !u!114 &5779668682805317886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1046539501109734236}
+  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: bf5180354d324cb4685dcfb6480b6a65, 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 &2619452353599805874
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5083361432870599404}
+  - component: {fileID: 2509446595925829763}
+  - component: {fileID: 4592088031274990077}
+  m_Layer: 5
+  m_Name: s
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5083361432870599404
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2619452353599805874}
+  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: 2568998946116628564}
+  m_RootOrder: 8
+  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: 47, y: -36}
+  m_SizeDelta: {x: 28, y: 31.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2509446595925829763
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2619452353599805874}
+  m_CullTransparentMesh: 1
+--- !u!114 &4592088031274990077
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2619452353599805874}
+  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: c1d35f3153f12a14c9c8957a905b0b28, 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 &3775171644986947867
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3229962652627218785}
+  - component: {fileID: 8591732795518714537}
+  - component: {fileID: 6097375841557453902}
+  m_Layer: 5
+  m_Name: check
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3229962652627218785
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3775171644986947867}
+  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: 2568998946116628564}
+  m_RootOrder: 4
+  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: 63, y: 62}
+  m_SizeDelta: {x: 62, y: 53}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8591732795518714537
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3775171644986947867}
+  m_CullTransparentMesh: 1
+--- !u!114 &6097375841557453902
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3775171644986947867}
+  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: 6257321a157c2d24abce62bfdffa3d3b, 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 &4089322903103464768
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3335062103840720553}
+  - component: {fileID: 8844624823740129944}
+  - component: {fileID: 8982877069286094955}
+  m_Layer: 5
+  m_Name: icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3335062103840720553
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4089322903103464768}
+  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: 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: 7}
+  m_SizeDelta: {x: 120, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8844624823740129944
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4089322903103464768}
+  m_CullTransparentMesh: 1
+--- !u!114 &8982877069286094955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4089322903103464768}
+  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 &4940665596048500704
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4089771124753005517}
+  - component: {fileID: 2123021332735512846}
+  - component: {fileID: 5978744269033148093}
+  m_Layer: 5
+  m_Name: fragment
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4089771124753005517
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4940665596048500704}
+  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: 2568998946116628564}
+  m_RootOrder: 6
+  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: -48, y: -37}
+  m_SizeDelta: {x: 32, y: 32}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2123021332735512846
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4940665596048500704}
+  m_CullTransparentMesh: 1
+--- !u!114 &5978744269033148093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4940665596048500704}
+  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: 063945c3b6adee543ada4d5f7cdd0a26, 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 &5323374437780563479
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1809421178593717387}
+  - component: {fileID: 7920022065948946223}
+  - component: {fileID: 2707856898863893581}
+  m_Layer: 5
+  m_Name: match_img
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1809421178593717387
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5323374437780563479}
+  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: 2568998946116628564}
+  m_RootOrder: 7
+  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: -48, y: 50}
+  m_SizeDelta: {x: 35.2, y: 35.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7920022065948946223
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5323374437780563479}
+  m_CullTransparentMesh: 1
+--- !u!114 &2707856898863893581
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5323374437780563479}
+  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 &6717709196054680970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2568998946116628564}
+  - component: {fileID: 7145656218889782844}
+  - component: {fileID: 6876715644725703649}
+  - component: {fileID: 2749216595134005900}
+  - component: {fileID: 8586307889625000740}
+  - component: {fileID: 4897465720603014445}
+  m_Layer: 5
+  m_Name: bounty_reward_cell
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2568998946116628564
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717709196054680970}
+  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:
+  - {fileID: 5993802040676866955}
+  - {fileID: 6232112434002766485}
+  - {fileID: 3335062103840720553}
+  - {fileID: 5164977974539208548}
+  - {fileID: 3229962652627218785}
+  - {fileID: 2631456693477493767}
+  - {fileID: 4089771124753005517}
+  - {fileID: 1809421178593717387}
+  - {fileID: 5083361432870599404}
+  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: 156, y: 152}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7145656218889782844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717709196054680970}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  prefabList:
+  - name: bounty_reward_cell.bg
+    hashName: 1322589525
+    objectType: 0
+    gameObject: {fileID: 218819111413039857}
+  - name: bounty_reward_cell.icon
+    hashName: 3993389449
+    objectType: 0
+    gameObject: {fileID: 4089322903103464768}
+  - name: bounty_reward_cell.num
+    hashName: 2345581686
+    objectType: 0
+    gameObject: {fileID: 7935477523361362109}
+  - name: bounty_reward_cell.check
+    hashName: 3530586616
+    objectType: 0
+    gameObject: {fileID: 3775171644986947867}
+  - name: bounty_reward_cell.fragment
+    hashName: 1359669088
+    objectType: 0
+    gameObject: {fileID: 4940665596048500704}
+  - name: bounty_reward_cell.light
+    hashName: 3538930182
+    objectType: 0
+    gameObject: {fileID: 6779517126958811877}
+  - name: bounty_reward_cell.lock
+    hashName: 3993489979
+    objectType: 0
+    gameObject: {fileID: 1046539501109734236}
+  - name: bounty_reward_cell.match_img
+    hashName: 3728134969
+    objectType: 0
+    gameObject: {fileID: 5323374437780563479}
+  - name: bounty_reward_cell.s
+    hashName: 3367800163
+    objectType: 0
+    gameObject: {fileID: 2619452353599805874}
+--- !u!225 &6876715644725703649
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717709196054680970}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
+--- !u!222 &2749216595134005900
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717709196054680970}
+  m_CullTransparentMesh: 1
+--- !u!114 &8586307889625000740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717709196054680970}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, 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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4897465720603014445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717709196054680970}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
+  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}
+  m_Layer: 5
+  m_Name: light
+  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: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2568998946116628564}
+  m_RootOrder: 1
+  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: 182, y: 178}
+  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: 21300000, guid: 6767eb4bb7d152447bb08b909b34c239, 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 &7935477523361362109
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5164977974539208548}
+  - component: {fileID: 2899151997899005891}
+  - component: {fileID: 1307457508842503146}
+  m_Layer: 5
+  m_Name: num
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5164977974539208548
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7935477523361362109}
+  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: 2568998946116628564}
+  m_RootOrder: 3
+  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: -46}
+  m_SizeDelta: {x: 89, y: 31}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2899151997899005891
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7935477523361362109}
+  m_CullTransparentMesh: 1
+--- !u!114 &1307457508842503146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7935477523361362109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 30
+  m_fontSizeBase: 30
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 0
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

Assets/prefabs/ui/arena/cell/bounty_reward_cell.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 313ffb3718589244c843bfb6465ca552
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: prefabs/ui/bounty/cell/bounty_reward_cell.prefab.ab
+  assetBundleVariant: 

Assets/prefabs/ui/bounty/bounty_main_ui.prefab

@@ -4609,10 +4609,6 @@ MonoBehaviour:
     hashName: 1760727837
     objectType: 0
     gameObject: {fileID: 8356722793166666039}
-  - name: bounty_main_ui.mid_node.preview.bg
-    hashName: 3006830840
-    objectType: 0
-    gameObject: {fileID: 5334968008068438326}
   - name: bounty_main_ui.top_node.ui_spine_obj
     hashName: 1136651914
     objectType: 6

Assets/prefabs/ui/dungeon/dungeon_difficulty_ui.prefab

@@ -3240,7 +3240,6 @@ GameObject:
   - component: {fileID: 433166238892458652}
   - component: {fileID: 6115082680960900928}
   - component: {fileID: 797638125786779706}
-  - component: {fileID: 7030190761463345147}
   m_Layer: 5
   m_Name: tx_buff
   m_TagString: Untagged
@@ -3262,9 +3261,9 @@ RectTransform:
   m_Father: {fileID: 1284250296368212181}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 264, y: -50}
+  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: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6115082680960900928
@@ -3364,20 +3363,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &7030190761463345147
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7151790527634189347}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
 --- !u!1 &7205581381937808942
 GameObject:
   m_ObjectHideFlags: 0
@@ -4067,7 +4052,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1284250296368212181}
-  - component: {fileID: 8619183955875916047}
   m_Layer: 5
   m_Name: boss_buff
   m_TagString: Untagged
@@ -4096,25 +4080,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 315}
   m_SizeDelta: {x: 580, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &8619183955875916047
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8420595173560184860}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 61cd9c9c2795741588033c81cd008e7e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  left: 0
-  right: 0
-  top: 0
-  bottom: 0
-  childAlignment: 4
-  spacing: 0
-  verticalOrHorizontal: 0
 --- !u!1 &8569402453532989726
 GameObject:
   m_ObjectHideFlags: 0
@@ -4328,8 +4293,8 @@ RectTransform:
   m_Father: {fileID: 1284250296368212181}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 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: 52, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/proto/protocol.bytes

@@ -1,5 +1,5 @@
 
-êª

+®Ç

 pb/proto/protocol.protocspb"ž

 Gift
 act_type
 
(RactType
@@ -98,7 +98,133 @@ trigger_at 
(R	triggerAt"d
 TriggerGoldGiftReq 
 gold_gift_id
 
(R
 goldGiftId"
-TriggerGoldGiftRsp"Ï
+TriggerGoldGiftRsp"ð
+Arena#
+
season_number
 
(RseasonNumber#
+
current_score 
(RcurrentScore
+
+last_score 
(R	lastScore0
+last_challenge_count 
(RlastChallengeCount0
+settle_reward_season 
(RsettleRewardSeason.
+attack_array_heroes (RattackArrayHeroes.
+defend_array_heroes (RdefendArrayHeroes4
+
+rival_info 
(2.cspb.MatchPlayerInfoR	rivalInfo(
+match_success_at	 
(RmatchSuccessAt4
+match_success_cd_end_at
+ 
(RmatchSuccessCdEndAt$
+today_ad_count 
(RtodayAdCount"»

+MatchPlayerInfo
+name
 
(	Rname
+level 
(Rlevel
+avatar 
(Ravatar!
+avatar_frame 
(RavatarFrame
+score 
(Rscore-
+array_heroes (2
+.cspb.HeroRarrayHeroes"—

+ChallengeRecordInfo
+win
 
(Rwin4
+
+match_info 
(2.cspb.MatchPlayerInfoR	matchInfo
+
+incr_score 
(R	incrScore
+occur_at 
(RoccurAt"©

+RankInfo
+rank
 
(Rrank
+score 
(Rscore
+name 
(	Rname
+level 
(Rlevel
+ID 
(	RID
+avatar 
(Ravatar!
+avatar_frame 
(RavatarFrame"*
+Rank"
+info
 (2.cspb.RankInfoRinfo"a
+PVPHeroesArrayReq%
+attack_heroIds
 (R
attackHeroIds%
+defend_heroIds (R
defendHeroIds"=
+PVPHeroesArrayRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode"
+
+MatchReq"j
+MatchRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode4
+
+match_info 
(2.cspb.MatchPlayerInfoR	matchInfo"
+PVPChallengeStartReq"d
+PVPChallengeStartRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode"
+costs (2.cspb.RewardRcosts"E
+PVPChallengeSettlementReq
+win
 
(Rwin
+season 
(Rseason"¨

+PVPChallengeSettlementRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode9
+
+settlement 
(2.cspb.ChallengeRecordInfoR
+settlement&
+rewards (2.cspb.RewardRrewards"
+PVPRecordHistoryReq"t
+PVPRecordHistoryRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode3
+history (2.cspb.ChallengeRecordInfoRhistory"
+PVPSeasonRewardReq"f
+PVPSeasonRewardRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode&
+rewards (2.cspb.RewardRrewards"
+
+PVPRankReq"n
+
+PVPRankRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode"
+top100 
(2
+.cspb.RankRtop100
+rank 
(Rrank"$
+PVPRankHeroesReq
+rid
 
(	Rrid"k
+PVPRankHeroesRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode-
+array_heroes (2
+.cspb.HeroRarrayHeroes"
+
+PVPInfoReq"b
+
+PVPInfoRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode*
+
+arena_info 
(2.cspb.ArenaR	arenaInfo"
+PVPOverCDReq
+ad
 
(Rad"l
+PVPOverCDRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode
+ad 
(Rad"
+costs (2.cspb.RewardRcosts"Þ
+ArenaBounty
+season
 
(Rseason
+level 
(Rlevel
+exp 
(Rexp
+bought 
(Rbought8
+claimed (2.cspb.ArenaBounty.ClaimedEntryRclaimedB
+pro_claimed (2!.cspb.ArenaBounty.ProClaimedEntryR
+proClaimed:
+ClaimedEntry
+key
 
(Rkey
+value 
(Rvalue:8
=
+ProClaimedEntry
+key
 
(Rkey
+value 
(Rvalue:8
"
+ArenaBountyLevelUnlockReq"i
+ArenaBountyLevelUnlockRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode"
+costs (2.cspb.RewardRcosts"C
+ArenaBountyRewardReq
+level
 
(Rlevel
+is_pro 
(RisPro"h
+ArenaBountyRewardRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode&
+rewards (2.cspb.RewardRrewards"D
+ArenaBountyBoughtNtf
+season
 
(Rseason
+level 
(Rlevel"Ï
 Bounty
 season
 
(Rseason
 level 
(Rlevel
@@ -562,7 +688,8 @@ 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
@@ -598,7 +725,8 @@ mall_daily 
(2.cspb.MallDailyR	mallDaily+
 	mall_idle 
(2.cspb.MallIdleRmallIdleS
 chapter_daily_challenge 
(2.cspb.ChapterDailyChallengeRchapterDailyChallengeP
 chapter_gold_challenge 
(2.cspb.ChapterGoldChallengeRchapterGoldChallengeV
-chapter_shards_challenge 
(2.cspb.ChapterShardsChallengeRchapterShardsChallenge"U
+chapter_shards_challenge 
(2.cspb.ChapterShardsChallengeRchapterShardsChallenge4
+arena_bounty 
(2.cspb.ArenaBountyRarenaBounty"U
 PipedReq
 id
 
(
Rid
 ts 
(Rts
@@ -735,7 +863,7 @@ clear10Hit
 skill_cast 
(R	skillCast
 	skill_box	 
(RskillBox&
 kills_boss_turn
- 
(R
killsBossTurn*…
+ 
(R
killsBossTurn*ì
 ErrCode
 SUCCESS
 
@@ -821,7 +949,19 @@ skill_cast 
(R	skillCast
 CDKEY_NOT_EXISTS¤

 CDKEY_ALREADY_USED¥

 
CDKEY_EXPIRED¦

-
CDKEY_LIMITED§
*L
+
CDKEY_LIMITED§

+HERO_IS_LOCK‰
+PVP_MATCH_AD_LIMITŠ
+PVP_MATCH_CD_LIMIT‹
+PVP_SETTLE_SEASON_TIMOUTŒ
+PVP_RANK_HEROES_FAILED<10>$
+PVP_SEASON_SETTLE_REWARD_FAILEDŽ
+PVP_MATCH_RIVAL_TIMEOUT<10>
+PVP_MATCH_INVALID<10>"
+ARENA_BOUNTY_TASK_NOT_REACHED‘
+ARENA_BOUNTY_TASK_CLAIMED’#
+ARENA_BOUNTY_LEVEL_NOT_REACHED“
+ARENA_BOUNTY_LEVEL_CLAIMED”*L
 
KickOutReason
 MAINTAIN
 	FLOW_CTRL