Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoUI.cs

@@ -0,0 +1,79 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_ActivityHuaRongDaoUI
+    {
+        public GComponent target;
+        public GButton m_btnClose;
+        public UI_item m_item;
+        public UI_items m_items;
+        public const string URL = "ui://wf8geywtnx120";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "ActivityHuaRongDaoUI";
+        private static UI_ActivityHuaRongDaoUI _proxy;
+
+        public static UI_ActivityHuaRongDaoUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityHuaRongDaoUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ActivityHuaRongDaoUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityHuaRongDaoUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_item = (UI_item)UI_item.Create(comp.GetChild("item"));
+            m_items = (UI_items)UI_items.Create(comp.GetChild("items"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnClose = null;
+            m_item.Dispose();
+            m_item = null;
+            m_items.Dispose();
+            m_items = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1ca937d08267c6749bce1e63a70ed9f2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_item.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_item
+    {
+        public GComponent target;
+        public GGraph m_item;
+        public GTextField m_index;
+        public const string URL = "ui://wf8geywtnx121";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "item";
+        private static UI_item _proxy;
+
+        public static UI_item Create(GObject gObject = null)
+        {
+            var ui = new UI_item();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_item Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_item();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_item = (GGraph)comp.GetChild("item");
+            m_index = (GTextField)comp.GetChild("index");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_item = null;
+            m_index = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_item.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6fad679d7dfe5dd48b5aaa55cd2e20e4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_items.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_items
+    {
+        public GComponent target;
+        public GGraph m_items;
+        public const string URL = "ui://wf8geywth8uk3";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "items";
+        private static UI_items _proxy;
+
+        public static UI_items Create(GObject gObject = null)
+        {
+            var ui = new UI_items();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_items Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_items();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_items = (GGraph)comp.GetChild("items");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_items = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_items.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 434c688ec88a5d544817b513fcaa98ed
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_CompFlower.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_CompFlower
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GImage m_f1;
+        public GImage m_f2;
+        public GImage m_f3;
+        public const string URL = "ui://b8ha2mnsrv7eq";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "CompFlower";
+        private static UI_CompFlower _proxy;
+
+        public static UI_CompFlower Create(GObject gObject = null)
+        {
+            var ui = new UI_CompFlower();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_CompFlower Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompFlower();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_f1 = (GImage)comp.GetChild("f1");
+            m_f2 = (GImage)comp.GetChild("f2");
+            m_f3 = (GImage)comp.GetChild("f3");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_f1 = null;
+            m_f2 = null;
+            m_f3 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_CompFlower.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e5c295e46cdf35847acafff9f511ac91
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenSererFightItem.cs

@@ -0,0 +1,108 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenSererFightItem
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GLoader m_loaIcon;
+        public GLoader m_loaItem;
+        public GTextField m_txtName;
+        public UI_CompFlower m_comFlower;
+        public GImage m_imgLockBg;
+        public GImage m_imgLock;
+        public GGroup m_grpLock;
+        public GGroup m_comFirstPass;
+        public GGroup m_Panel;
+        public Transition m_ToLeft;
+        public Transition m_ToRight;
+        public Transition m_Left;
+        public const string URL = "ui://b8ha2mnsrv7eo";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenSererFightItem";
+        private static UI_OpenSererFightItem _proxy;
+
+        public static UI_OpenSererFightItem Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenSererFightItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_OpenSererFightItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenSererFightItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_loaItem = (GLoader)comp.GetChild("loaItem");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_comFlower = (UI_CompFlower)UI_CompFlower.Create(comp.GetChild("comFlower"));
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
+            m_comFirstPass = (GGroup)comp.GetChild("comFirstPass");
+            m_Panel = (GGroup)comp.GetChild("Panel");
+            m_ToLeft = comp.GetTransition("ToLeft");
+            m_ToRight = comp.GetTransition("ToRight");
+            m_Left = comp.GetTransition("Left");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_loaIcon = null;
+            m_loaItem = null;
+            m_txtName = null;
+            m_comFlower.Dispose();
+            m_comFlower = null;
+            m_imgLockBg = null;
+            m_imgLock = null;
+            m_grpLock = null;
+            m_comFirstPass = null;
+            m_Panel = null;
+            m_ToLeft = null;
+            m_ToRight = null;
+            m_Left = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenSererFightItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 74bc511ef2330514ab75be1ee0feef54
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerFightUI.cs

@@ -11,6 +11,8 @@ namespace UI.OpenServerActivity
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public GList m_list;
+        public GLoader m_iconSuidAdd;
+        public GTextField m_txtFreeNum;
         public const string URL = "ui://b8ha2mnspll2h";
         public const string PACKAGE_NAME = "OpenServerActivity";
         public const string RES_NAME = "OpenServerFightUI";
@@ -62,6 +64,8 @@ namespace UI.OpenServerActivity
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_list = (GList)comp.GetChild("list");
+            m_iconSuidAdd = (GLoader)comp.GetChild("iconSuidAdd");
+            m_txtFreeNum = (GTextField)comp.GetChild("txtFreeNum");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +73,8 @@ namespace UI.OpenServerActivity
             m_valueBar = null;
             m_btnBack = null;
             m_list = null;
+            m_iconSuidAdd = null;
+            m_txtFreeNum = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs

@@ -31,6 +31,7 @@ namespace UI.RoleInfo
         public GTextField m_txtRoleID;
         public GButton m_btnCopy;
         public GButton m_btnSetting;
+        public GButton m_btnHuaRongDao;
         public const string URL = "ui://374k3dwvd4iw6k";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "RoleInfoUI";
@@ -102,6 +103,7 @@ namespace UI.RoleInfo
             m_txtRoleID = (GTextField)comp.GetChild("txtRoleID");
             m_btnCopy = (GButton)comp.GetChild("btnCopy");
             m_btnSetting = (GButton)comp.GetChild("btnSetting");
+            m_btnHuaRongDao = (GButton)comp.GetChild("btnHuaRongDao");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -132,6 +134,7 @@ namespace UI.RoleInfo
             m_txtRoleID = null;
             m_btnCopy = null;
             m_btnSetting = null;
+            m_btnHuaRongDao = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs

@@ -0,0 +1,305 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UI.ActivityHuaRongDao;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class ActivityHuaRongDaoView : BaseWindow
+    {
+        private UI_ActivityHuaRongDaoUI _ui;
+        public class Grid
+        {
+            public Vector2 pos;
+            public int num;
+        }
+
+        private Grid[,] gridArr;
+        private int gridNum = 3;
+        private List<GObject> items;
+        private bool firstInit;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityHuaRongDaoUI.PACKAGE_NAME;
+            _ui = UI_ActivityHuaRongDaoUI.Create();
+            viewCom = _ui.target;
+            viewCom.Center();
+            modal = true;
+
+            _ui.m_item.target.visible = false;
+            _ui.m_btnClose.onClick.Add(Hide);
+
+            firstInit = true;
+
+            InitGridInfo();
+            CreateItems();
+            InitItems();
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            if (!firstInit)
+            {
+                SetGridInfo();
+                InitItems();
+            }
+            else
+            {
+                firstInit = false;
+            }
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        /// <summary>
+        /// 初始化所有格子的信息
+        /// </summary>
+        private void InitGridInfo()
+        {
+            gridArr = new Grid[gridNum, gridNum];
+            items = new List<GObject>();
+
+            for (int i = 0; i < gridNum; i++)
+            {
+                for (int j = 0; j < gridNum; j++)
+                {
+                    gridArr[i, j] = new Grid();
+                }
+            }
+
+            SetGridInfo();
+        }
+
+        private void SetGridInfo()
+        {
+            List<int> numList = GetRandomArr(1, 8);
+            //List<int> numList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 0, 8 };
+            Vector2 originPos = _ui.m_item.target.position;
+
+            for (int i = 0; i < gridNum; i++)
+            {
+                for (int j = 0; j < gridNum; j++)
+                {
+                    gridArr[i, j].num = numList[i * gridNum + j];
+                    gridArr[i, j].pos = originPos + new Vector2(j * _ui.m_item.target.width, i * _ui.m_item.target.height);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 随机排序 min~max 连续的数字
+        /// </summary>
+        /// <param name="min"></param>
+        /// <param name="max"></param>
+        /// <returns></returns>
+        private List<int> GetRandomArr(int min, int max)
+        {
+            List<int> list = new List<int>();
+            for (int i = min; i <= max; i++)
+            {
+                list.Add(i);
+            }
+
+            System.Random r = new System.Random();
+            for (int i = 0; i < list.Count; i++)
+            {
+                int index = r.Next(list.Count);
+                int temp = list[index];
+                list[index] = list[i];
+                list[i] = temp;
+            }
+
+            // 最后一个是空的
+            list.Add(0);
+
+            return list;
+        }
+
+        private void InitItems()
+        {
+            int itemIndex = 0;
+            for (int i = 0; i < gridNum; i++)
+            {
+                for (int j = 0; j < gridNum; j++)
+                {
+                    // 空格不用放item
+                    if (gridArr[i, j].num == 0)
+                    {
+                        continue;
+                    }
+
+                    items[itemIndex].position = gridArr[i, j].pos;
+                    UI_item item = UI_item.Proxy(items[itemIndex]);
+                    item.m_index.text = gridArr[i, j].num.ToString();
+                    items[itemIndex].data = gridArr[i, j].num;
+                    UI_item.ProxyEnd();
+                    ++itemIndex;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 创建可移动的实体
+        /// </summary>
+        private void CreateItems()
+        {
+            for (int i = 1; i <= gridNum * gridNum - 1; i++)
+            {
+                GObject gObject = UIPackage.CreateObject("ActivityHuaRongDao", "item");
+                gObject.name = "item" + i;
+                gObject.onClick.Add(OnItemClick);
+                _ui.m_items.target.AddChild(gObject);
+                items.Add(gObject);
+            }
+        }
+
+        private void OnItemClick(EventContext eventContext)
+        {
+            GObject obj = eventContext.sender as GObject;
+            int num = (int)obj.data;
+            Grid newGrid = CheckCanMove(num);
+            if (newGrid != null)
+            {
+                _ui.m_items.target.touchable = false;
+                obj.TweenMove(newGrid.pos, 0.3f).OnComplete(()=>
+                {
+                    _ui.m_items.target.touchable = true;
+                    CheckWin();
+                });
+            }
+        }
+
+        private Grid CheckCanMove(int num)
+        {
+            int indexX = 0;
+            int indexY = 0;
+
+            // 找到格子
+            for (int i = 0; i < gridNum; i++)
+            {
+                for (int j = 0; j < gridNum; j++)
+                {
+                    if (gridArr[i, j].num == num)
+                    {
+                        indexX = i;
+                        indexY = j;
+                        break;
+                    }
+                }
+            }
+
+            // 判断格子四个方向是否有空格
+            if (CheckHaveNullGrid(indexX - 1, indexY) || CheckHaveNullGrid(indexX, indexY - 1)
+                || CheckHaveNullGrid(indexX + 1, indexY) || CheckHaveNullGrid(indexX, indexY + 1))
+            {
+                return UpdateGridInfo(num);
+            }
+
+            return null;
+        }
+
+        private bool CheckHaveNullGrid(int indexX, int indexY)
+        {
+            if (indexX >= 0 && indexX < gridNum)
+            {
+                if (indexY >= 0 && indexY < gridNum)
+                {
+                    return gridArr[indexX, indexY].num == 0;
+                }
+            }
+
+            return false;
+        }
+
+        private Grid UpdateGridInfo(int num)
+        {
+            Vector2 nullGridindex = new Vector2(-1, 0);
+            Vector2 numGridindex = new Vector2(-1, 0);
+
+
+            for (int i = 0; i < gridNum; i++)
+            {
+                for (int j = 0; j < gridNum; j++)
+                {
+                    if (gridArr[i, j].num == num)
+                    {
+                        numGridindex = new Vector2(i, j);
+                    }
+                    else if (gridArr[i, j].num == 0)
+                    {
+                        nullGridindex = new Vector2(i, j);
+                    }
+                    if (numGridindex.x != -1 && nullGridindex.x != -1)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            gridArr[(int)numGridindex.x, (int)numGridindex.y].num = 0;
+            gridArr[(int)nullGridindex.x, (int)nullGridindex.y].num = num;
+
+            return gridArr[(int)nullGridindex.x, (int)nullGridindex.y];
+        }
+
+        private void CheckWin()
+        {
+            int num = 0;
+            for (int i = 0; i < gridNum; i++)
+            {
+                for (int j = 0; j < gridNum; j++)
+                {
+                    if (i == 0 && j == 0)
+                    {
+                        num = gridArr[i, j].num;
+                        if(num != 1)
+                        {
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        // 不连续 没有胜利
+                        if (gridArr[i, j].num != num + 1)
+                        {
+                            return;
+                        }
+                        // 继续检测
+                        else
+                        {
+                            ++num;
+                            // 胜利
+                            if (num == gridNum * gridNum - 1)
+                            {
+                                Debug.Log("You Win!!");
+                            }
+                        }
+                    }
+
+                }
+            }
+
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8f184936c784b6740a0e14cc3f46d47c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs

@@ -21,8 +21,10 @@ namespace GFGGame
         private int needNum;
         //游戏结束时长(配置)
         private int gameTime = 120;
-        //游戏当前时长
+        //游戏当前时长倒计时
         private int currentGameTime = 120;
+        //当前游戏时长
+        private int timeIndex = 0;
         //进度条
         private float barTime = 120.0f;
         //行数
@@ -130,6 +132,7 @@ namespace GFGGame
         }
         private void UpdateView()
         {
+            timeIndex = 0;
             currentGameTime = gameTime;
             currentCardNum = cardNum;
             barTime = (float)gameTime;
@@ -257,6 +260,7 @@ namespace GFGGame
         }
         private void UpdateTime(object param = null)
         {
+            timeIndex++;
             currentGameTime--;
             //_ui.m_ScareBar.value = currentGameTime;
             _ui.m_timeText.text = string.Format ("{0}", currentGameTime);
@@ -282,7 +286,7 @@ namespace GFGGame
             Timers.inst.Remove(UpdateBar);
             if (isPass)
             {
-                ViewManager.Show<ResultTipsView>(new object[] { isPass, typeof(FlipGameView).FullName, currentGameTime });
+                ViewManager.Show<ResultTipsView>(new object[] { isPass, typeof(FlipGameView).FullName, timeIndex });
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs

@@ -14,7 +14,7 @@ namespace GFGGame
         private int timeResult;
         private string gameName;
 
-        //通关评价
+        //通关评价,不同关卡不同
         private List<int> CustemsNum = new List<int>()
         {
             10,
@@ -107,6 +107,9 @@ namespace GFGGame
                     _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star";
                     break;
                 default:
+                    _ui.m_star1.url = "ui://MiniGame/tb_zx_pt_star_grey";
+                    _ui.m_star2.url = "ui://MiniGame/tb_zx_pt_star_grey";
+                    _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star_grey";
                     break;
             }
         }

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs

@@ -26,6 +26,13 @@ namespace GFGGame
         private int scoreMax = 0;
         //目标分数
         private int targetNum = 128;
+        //评价
+        private List<int> CustemsNum = new List<int>()
+        {
+            240,
+            180,
+            120,
+        };
         private bool isMove;
         private bool isMerge;
         private struct NumPos
@@ -93,7 +100,7 @@ namespace GFGGame
         {
             time = 0;
             score = 0;
-            targetNum = 64;
+            targetNum = 512;
             _ui.m_score.text = string.Format("分数：{0}", score.ToString());
             _ui.m_score.visible = false;
             rand = new System.Random();
@@ -162,8 +169,7 @@ namespace GFGGame
             }
             if(!gameOver)
             {
-                // 游戏结束
-                GameOver(false);
+                //GameOver(false);
                 return;
             }
             while (true)
@@ -420,12 +426,15 @@ namespace GFGGame
             }
             if(isMerge || isMove)
             {
-                isMerge = false;
                 isMove = false;
+                isMerge = false;
                 UpdateList();
                 numPosArray.Clear();
             }
-            CheckArray();
+            else
+            {
+                CheckArray();
+            }
         }
 
         private void OnClickBegin()

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerFightView.cs

@@ -42,6 +42,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_iconSuidAdd.onClick.Add(OnClickIconSuidAdd);
         }
 
         protected override void AddEventListener()
@@ -62,6 +63,8 @@ namespace GFGGame
             _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_activityFightCfg.type, _activityFightCfg.subType, _activityCfg.params3Arr[0]);
             _ui.m_list.numItems = _storyLevelCfgs.Count;
             UpdateItem();
+
+            _ui.m_txtFreeNum.text = "10/11";
         }
 
         protected override void OnHide()
@@ -79,10 +82,15 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(OpenServerFightView).FullName);
         }
 
+        private void OnClickIconSuidAdd()
+        {
+            ViewManager.GoBackFrom(typeof(OpenServerFightView).FullName);
+        }
+        
         private void RenderListItem(int index, GObject obj)
         {
             // int _index = _storyLevelCfgs.Count - index - 1;
-            UI_ListLevelItem item = UI_ListLevelItem.Proxy(obj);
+            UI_OpenSererFightItem item = UI_OpenSererFightItem.Proxy(obj);
             //item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
             item.m_txtName.text = _storyLevelCfgs[index].name;
             bool isFight = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID);
@@ -112,13 +120,19 @@ namespace GFGGame
                 item.m_loaIcon.url = string.Format("ui://Studio/{0}", _activityFightCfg.res);
             }
             item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
+
+            if (!item.m_grpLock.visible)
+                item.m_comFirstPass.visible = !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index].id);
+            else
+                item.m_comFirstPass.visible = false;
+
             item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
             if (item.m_loaBg.data == null)
             {
                 item.m_loaBg.onClick.Add(OnListItemClick);
             }
             item.m_loaBg.data = index;
-            UI_ListLevelItem.ProxyEnd();
+            UI_OpenSererFightItem.ProxyEnd();
         }
 
         private void OnListItemClick(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs

@@ -12,7 +12,6 @@ namespace GFGGame
         private UI_ChangeNameUI _ui;
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
-        private bool _isNewPlayer;
 
         public override void Dispose()
         {
@@ -51,27 +50,20 @@ namespace GFGGame
             base.OnShown();
             this._ui.m_inputName.text = "";
 
-            _isNewPlayer = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) == 1;
-            _ui.m_c1.SetSelectedIndex(_isNewPlayer ? 0 : 1);
-
             long haveNum = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
             long needNum = GlobalCfgArray.globalCfg.changeNameCostArr[1];
-            if (!_isNewPlayer)
+            if (haveNum < needNum)
             {
-                if (haveNum < needNum)
-                {
-                    _ui.m_txtNeed.text = string.Format("改名卡：[color=#E26A21]{0}[color]/{1}", haveNum, needNum);
-                }
-                else
-                {
-                    _ui.m_txtNeed.text = string.Format("改名卡：{0}/{1}", haveNum, needNum);
-                }
-                ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
-                //_ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
-                _ui.m_loaIcon.url = ResPathUtil.GetIconPath(cfg.res, "png");
-                _ui.m_loaIcon.onClick.Add(OnBtnIconClick);
-
+                _ui.m_txtNeed.text = string.Format("改名卡：[color=#E26A21]{0}[color]/{1}", haveNum, needNum);
+            }
+            else
+            {
+                _ui.m_txtNeed.text = string.Format("改名卡：{0}/{1}", haveNum, needNum);
             }
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
+            //_ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
+            _ui.m_loaIcon.url = ResPathUtil.GetIconPath(cfg.res, "png");
+            _ui.m_loaIcon.onClick.Add(OnBtnIconClick);
         }
 
         protected override void OnHide()
@@ -110,18 +102,11 @@ namespace GFGGame
             string costName = ItemUtil.GetItemName(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
             int count = GlobalCfgArray.globalCfg.changeNameCostArr[1];
 
-            if (_isNewPlayer)
+            AlertUI.Show(string.Format("是否花费{0}个{1}改名1次？", count, costName))
+            .SetLeftButton(true).SetRightButton(true, "确定", (object data) =>
             {
                 ChangeName(roleName);
-            }
-            else
-            {
-                AlertUI.Show(string.Format("是否花费{0}个{1}改名1次？", count, costName))
-                .SetLeftButton(true).SetRightButton(true, "确定", (object data) =>
-                {
-                    ChangeName(roleName);
-                });
-            }
+            });
 
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -91,7 +91,15 @@ namespace GFGGame
                 _ui.m_txtExp.text = "已满级";
             }
 
-            _ui.m_txtSloganLabel.text = _roleDetailInfo.slogan;
+            if (_roleDetailInfo.slogan.Length > 0)
+            {
+                _ui.m_txtSloganLabel.text = _roleDetailInfo.slogan;
+            }
+            else
+            {
+                _ui.m_txtSloganLabel.text = "暂未设置个人简介";
+            }
+
             _ui.m_photoList.numItems = _roleDetailInfo.showPhotoList.Count;
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -50,6 +50,8 @@ namespace GFGGame
             _ui.m_photoList.itemRenderer = RenderPhotoListItem;
             _ui.m_photoList.onClickItem.Add(OnPhotoListItemClick);
             _ui.m_badgeList.itemRenderer = OnRenderBadgeListItem;
+
+            _ui.m_btnHuaRongDao.onClick.Add(OnBtnHuaRongDaoClick);
         }
 
         protected override void AddEventListener()
@@ -307,5 +309,10 @@ namespace GFGGame
             _ui.m_badgeList.numItems = _ui.m_badgeList.numItems;
 
         }
+
+        private void OnBtnHuaRongDaoClick()
+        {
+            ViewManager.Show<ActivityHuaRongDaoView>();
+        }
     }
 }

GameClient/Assets/ResIn/UI/ActivityHuaRongDao.meta

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

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 546fcaa87c1bc98428139336dfa79e33
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: