Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-24 e021cfde673e4efcca02efb30931ae5b1ebd76cc

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -172,6 +172,9 @@
        Register(typeof(HA317_tagMCAllEquipAttrActiveInfo), typeof(DTCA317_tagMCAllEquipAttrActiveInfo));   //得到激活全身星级和全身强化的信息

        Register(typeof(HA321_tagMCPrayElixirResult), typeof(DTCA321_tagMCPrayElixirResult)); //祈福丹药结果

        Register(typeof(HA921_tagUpdatePlayerNameResult), typeof(DTCA921_tagUpdatePlayerNameResult)); //玩家改名

        Register(typeof(HB205_tagMCHelpBattleCheckInResult), typeof(DTCB205_tagMCHelpBattleCheckInResult));

        Register(typeof(HB206_tagMCHelpBattleCallResult), typeof(DTCB206_tagMCHelpBattleCallResult));

        Register(typeof(HB207_tagMCHelpBattleList), typeof(DTCB207_tagMCHelpBattleList));



        #region 背包

        Register(typeof(H0724_tagRolePackCanUseCount), typeof(DTC0724_tagRolePackCanUseCount));


 Core/NetworkPackage/DTCFile/ServerPack/HB2_ActionMap/DTCB205_tagMCHelpBattleCheckInResult.cs

@@ -1,11 +1,23 @@
using UnityEngine;

using System.Collections;

using Snxxz.UI;



// B2 05 助战登记结果 #tagMCHelpBattleCheckInResult



public class DTCB205_tagMCHelpBattleCheckInResult : DtcBasic {

    public override void Done(GameNetPackBasic vNetPack) {

        base.Done(vNetPack);

        HB205_tagMCHelpBattleCheckInResult vNetData = vNetPack as HB205_tagMCHelpBattleCheckInResult;

    }

}

// B2 05 助战登记结果 #tagMCHelpBattleCheckInResult







public class DTCB205_tagMCHelpBattleCheckInResult : DtcBasic {



    DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }



    public override void Done(GameNetPackBasic vNetPack) {



        base.Done(vNetPack);



        HB205_tagMCHelpBattleCheckInResult vNetData = vNetPack as HB205_tagMCHelpBattleCheckInResult;

        assistModel.UpdateAssistCheckInResult(vNetData);



    }



}




 Core/NetworkPackage/DTCFile/ServerPack/HB2_ActionMap/DTCB206_tagMCHelpBattleCallResult.cs

@@ -1,11 +1,22 @@
using UnityEngine;

using System.Collections;

using Snxxz.UI;



// B2 06 助战召唤结果 #tagMCHelpBattleCallResult



public class DTCB206_tagMCHelpBattleCallResult : DtcBasic {

    public override void Done(GameNetPackBasic vNetPack) {

        base.Done(vNetPack);

        HB206_tagMCHelpBattleCallResult vNetData = vNetPack as HB206_tagMCHelpBattleCallResult;

    }

}

// B2 06 助战召唤结果 #tagMCHelpBattleCallResult







public class DTCB206_tagMCHelpBattleCallResult : DtcBasic {



    DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }



    public override void Done(GameNetPackBasic vNetPack) {



        base.Done(vNetPack);



        HB206_tagMCHelpBattleCallResult vNetData = vNetPack as HB206_tagMCHelpBattleCallResult;

        assistModel.UpdataAssistPlayer(vNetData);

    }



}




 Core/NetworkPackage/DTCFile/ServerPack/HB2_ActionMap/DTCB207_tagMCHelpBattleList.cs

@@ -1,11 +1,21 @@
using UnityEngine;

using System.Collections;

using Snxxz.UI;

// B2 07 助战机器人列表 #tagMCHelpBattleList



// B2 07 助战机器人列表 #tagMCHelpBattleList



public class DTCB207_tagMCHelpBattleList : DtcBasic {

    public override void Done(GameNetPackBasic vNetPack) {

        base.Done(vNetPack);

        HB207_tagMCHelpBattleList vNetData = vNetPack as HB207_tagMCHelpBattleList;

    }

}





public class DTCB207_tagMCHelpBattleList : DtcBasic {



    DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }



    public override void Done(GameNetPackBasic vNetPack) {



        base.Done(vNetPack);



        HB207_tagMCHelpBattleList vNetData = vNetPack as HB207_tagMCHelpBattleList;

        assistModel.UpdateAssistList(vNetData);

    }



}




 Core/NetworkPackage/ServerPack/HB2_ActionMap/HB207_tagMCHelpBattleList.cs

@@ -26,6 +26,7 @@
            TransBytes (out HelpPlayerList[i].Job, vBytes, NetDataType.BYTE);


            TransBytes (out HelpPlayerList[i].RealmLV, vBytes, NetDataType.WORD);


            TransBytes (out HelpPlayerList[i].FightPower, vBytes, NetDataType.DWORD);


            TransBytes (out HelpPlayerList[i].Relation, vBytes, NetDataType.BYTE);

            TransBytes (out HelpPlayerList[i].IsNeedGold, vBytes, NetDataType.BYTE);


        }


    }


@@ -39,6 +40,7 @@
        public byte Job;        // 玩家职业， 如果是机器人，则职业有值，服务端控制


        public ushort RealmLV;        // 玩家境界等级


        public uint FightPower;        // 玩家战力


        public byte Relation;        // 关系：0-无，1-好友，2-盟友

        public byte IsNeedGold;        // 是否需要仙玉召唤


    }






 System/ClientVersion/VersionConfig.cs

@@ -10,7 +10,7 @@
[CreateAssetMenu(menuName = "Config/VersionConfig")]

public class VersionConfig : ScriptableObject

{

    public const string VERSION_ALTERNATIVE = "1.2.0";

    public const string VERSION_ALTERNATIVE = "0.0.0";



    [SerializeField] public string m_AppId = string.Empty;

    public string appId


 System/Dungeon/AssistPlayerCell.cs

@@ -108,12 +108,9 @@
                    break;

            }



            if (rewards != null)

            if (rewards != null && rewards.Count > 0)

            {

                for (int i = 0; i < rewards.Count; i++)

                {

                    sumCoins += rewards[i];

                }

                sumCoins = rewards[0];

            }



            if (sumCoins > 0)


 System/Dungeon/DungeonAssistModel.cs

@@ -55,6 +55,87 @@
            return assistRefreshNum < freeRefreshNum;

        }



        public bool IsMaxAssistCoinsAddByVip(out int nextVipLv,out int coins)

        {

            nextVipLv = 0;

            coins = 0;

            var vipDict = VipPrivilegeConfig.GetVipPrivilegeDic(VipPrivilegeType.AssistXianYuanCoinsAdd);

            if (vipDict == null) return false;



            int vipLv = PlayerDatas.Instance.baseData.VIPLv;

            List<int> vipLvlist = vipDict.Keys.ToList();

            vipLvlist.Sort();



            for(int i = 0; i < vipLvlist.Count; i++)

            {

                var lv = vipLvlist[i];

                var addCoins = vipDict[lv];

                if (lv > vipLv && addCoins > 0)

                {

                    nextVipLv = lv;

                    coins = addCoins;

                    return false;

                }

            }



            for(int i = vipLvlist.Count - 1; i > -1; i--)

            {

                var lv = vipLvlist[i];

                var addCoins = vipDict[lv];

                if(addCoins > 0)

                {

                    if(vipLv >= lv)

                    {

                        nextVipLv = lv;

                        coins = addCoins;

                        return true;

                    }

                    break;

                }

            }

            return false;

        }



        public bool IsMaxAssistCoinsRatioAddByVip(out int nextVipLv,out float ratio)

        {

            nextVipLv = 0;

            ratio = 0;

            var vipDict = VipPrivilegeConfig.GetVipPrivilegeDic(VipPrivilegeType.AssistXianYuanCoinsRatioAdd);

            if (vipDict == null) return false;



            int vipLv = PlayerDatas.Instance.baseData.VIPLv;

            List<int> vipLvlist = vipDict.Keys.ToList();

            vipLvlist.Sort();

            for (int i = 0; i < vipLvlist.Count; i++)

            {

                var lv = vipLvlist[i];

                var addRatio = vipDict[lv];

                if (lv > vipLv && addRatio > 0)

                {

                    nextVipLv = lv;

                    ratio = (float)addRatio/100;

                    return false;

                }

            }



            for (int i = vipLvlist.Count - 1; i > -1; i--)

            {

                var lv = vipLvlist[i];

                var addRatio = vipDict[lv];

                if (addRatio > 0)

                {

                    if (vipLv >= lv)

                    {

                        nextVipLv = lv;

                        ratio = (float)addRatio / 100;

                        return true;

                    }

                    break;

                }

            }

            return false;

        }



        public RelatedToPlayer GetRelatedToPlayer(int playerId)

        {

            bool isFriend =  friendsModel.GetFirendInfo((uint)playerId,(byte)GroupType.Friend) != null;

@@ -211,6 +292,11 @@
            {

                UpdataAssistPlayerListEvent();

            }



            if (!WindowCenter.Instance.IsOpen<DungeonAssistPlayerWin>())

            {

                WindowCenter.Instance.Open<DungeonAssistPlayerWin>();

            }

        }



        public event Action<int> UpdataAssistPlayerEvent;

@@ -220,11 +306,22 @@
            if(playerInfo != null)

            {

                playerInfo.SetObjID((int)callResult.ObjID);

                if (UpdataAssistPlayerEvent != null)

                if (GetAlreadyAssistNum() >= 3)

                {

                    UpdataAssistPlayerEvent(playerInfo.PlayerID);

                    if (WindowCenter.Instance.IsOpen<DungeonAssistPlayerWin>())

                    {

                        WindowCenter.Instance.CloseImmediately<DungeonAssistPlayerWin>();

                    }

                }

                else

                {

                    if (UpdataAssistPlayerEvent != null)

                    {

                        UpdataAssistPlayerEvent(playerInfo.PlayerID);

                    }

                }

            }

           
        }



        public AssistPlayerInfo GetAssistPlayerInfo(int playerId)

@@ -237,6 +334,20 @@
        public List<AssistPlayerInfo> GetAssistPlayerInfos()

        {

            return assistPlayerDict.Values.ToList();

        }



        public int GetAlreadyAssistNum()

        {

            int num = 0;

            foreach (var key in assistPlayerDict.Keys)

            {

                var info = assistPlayerDict[key];

                if(info.IsAssist)

                {

                    num += 1;

                }

            }

            return num;

        }



        public void SendAssistCheckIn()

@@ -393,7 +504,7 @@
                    RealmLV = battlePlayer.RealmLV;

                    FightPower = (int)battlePlayer.FightPower;

                    IsNeedGold = battlePlayer.IsNeedGold;

                    relatedToPlayer = assistModel.GetRelatedToPlayer(PlayerID);

                    relatedToPlayer = (RelatedToPlayer)battlePlayer.Relation;

                }

                else

                {

@@ -437,10 +548,10 @@


        public enum RelatedToPlayer

        {

            None,//没关系

            Friend, //好友

            Ally, //盟友

            FriendAndAlly, //既是好友又是盟友

            None = 0,//没关系

            Friend = 1, //好友

            Ally = 2, //盟友

            FriendAndAlly = 3, //既是好友又是盟友

        }

    }

}


 System/Dungeon/DungeonAssistPlayerWin.cs

@@ -125,13 +125,41 @@


        private void ClickOneKeyAssist()

        {

            assistModel.SendPlayerAssist(1);

            CloseClick();

        }



        private void ClickRefresh()

        {

            UpdateAssistPlayers();

            UpdateOneKeyAssist();

            int remainNum = 0;

            bool isFree = assistModel.TryGetFreeRefresh(out remainNum);

            if(isFree)

            {

                assistModel.SendAssistRefresh();

            }

            else

            {

                ulong haveBindGold = UIHelper.GetMoneyCnt(2);

                if(haveBindGold < (ulong)assistModel.refreshCostMoney)

                {

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("DungeonAssist130", assistModel.refreshCostMoney),

                        (bool isOk) =>

                        {

                            if(isOk)

                            {

                                ulong haveGold = UIHelper.GetMoneyCnt(1);

                                if(haveGold >= (ulong)assistModel.refreshCostMoney)

                                {

                                    assistModel.SendAssistRefresh();

                                }

                                else

                                {

                                    WindowCenter.Instance.Open<RechargeTipWin>();

                                }

                            }

                        });

                }

            }

        }

    }

}


 System/Dungeon/DungeonAssistWin.cs

@@ -14,6 +14,14 @@
        [SerializeField] Button storeBtn;

        [SerializeField] Button registerBtn;

        [SerializeField] Image registerBgImg;

        [SerializeField] Text vipAddText;

        [SerializeField] Text vipRatioText;

        [SerializeField] Text vipMaxAddText;

        [SerializeField] Text vipMaxRatioText;

        [SerializeField] GameObject privilege_01;

        [SerializeField] GameObject privilege_02;

        [SerializeField] GameObject privilege_01Max;

        [SerializeField] GameObject privilege_02Max;



        DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }



@@ -57,6 +65,7 @@
        {

            CreateResultCell();

            UpdateRegisterBtn();

            UpdateVipAddCoins();

        }



        private void CreateResultCell()

@@ -78,6 +87,44 @@
            CreateResultCell();

        }



        private void UpdateXianYuanCoins()

        {

            dayScoreText.text = StringUtility.Contact(0,"/",assistModel.maxXianYuanCoins);

        }



        private void UpdateVipAddCoins()

        {

            int addvipLv = 0;

            int addCoins = 0;

            bool isAddMax =  assistModel.IsMaxAssistCoinsAddByVip(out addvipLv, out addCoins);

            privilege_01.SetActive(!isAddMax);

            privilege_01Max.SetActive(isAddMax);

            if(!isAddMax)

            {

                vipAddText.text = Language.Get("DungeonAssist125", addvipLv, addCoins);

            }

            else

            {

                vipMaxAddText.text = Language.Get("DungeonAssist139",addCoins);

            }

            int ratiovipLv = 0;

            float addRatio = 0;

            bool isRatioMax = assistModel.IsMaxAssistCoinsRatioAddByVip(out ratiovipLv,out addRatio);

            privilege_02.SetActive(!isRatioMax);

            privilege_02Max.SetActive(isRatioMax);

            if(!isRatioMax)

            {

                string addRatioStr = StringUtility.Contact(addRatio,"%");

                vipRatioText.text = Language.Get("DungeonAssist126", ratiovipLv, addRatioStr);

            }

            else

            {

                string addRatioStr = StringUtility.Contact(addRatio, "%");

                vipMaxRatioText.text = Language.Get("DungeonAssist140", addRatioStr);

            }

         
        }



        private void UpdateRegisterBtn()

        {

            registerBtn.RemoveAllListeners();


 Utility/EnumHelper.cs

@@ -1119,6 +1119,8 @@
    BindJadeWheel = 30,

    PrayForDrug = 31,

    DemonJarAuto = 32,

    AssistXianYuanCoinsAdd = 33,//助战仙缘币上限加成

    AssistXianYuanCoinsRatioAdd = 34,//助战仙缘币获得倍率加成（万分比）

}