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

client_Wu Xijin

2019-06-10 e46295a81f4e3a2135159577f65489469e6c0af9

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

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -25,6 +25,7 @@
    public static void Init()

    {

        // 登记相应的数据体及对应的数据转逻辑类

        Register(typeof(HA40D_tagGCServerCreatFamilyTimes), typeof(DTCA40D_tagGCServerCreatFamilyTimes));

        Register(typeof(HAC07_tagGCHorsePetBossInfo), typeof(DTCAC07_tagGCHorsePetBossInfo));

        Register(typeof(HB216_tagMCStartCustomSceneResult), typeof(DTCB216_tagMCStartCustomSceneResult));

        Register(typeof(HA905_tagGCNotifyEquipDetailInfo), typeof(DTCA905_tagGCNotifyEquipDetailInfo));


 Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA40D_tagGCServerCreatFamilyTimes.cs

New file
@@ -0,0 +1,23 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Monday, June 10, 2019

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using Snxxz.UI;

public class DTCA40D_tagGCServerCreatFamilyTimes : DtcBasic {



    public override void Done(GameNetPackBasic vNetPack)

    {

        base.Done(vNetPack);

        var package = vNetPack as HA40D_tagGCServerCreatFamilyTimes;

        ModelCenter.Instance.GetModel<FairyModel>().ReceivePackage(package);

    }



}










 Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA40D_tagGCServerCreatFamilyTimes.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: b979a9bafc3892f45bf585eb5a5e3a17
timeCreated: 1560154228
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Core/NetworkPackage/ServerPack/HA4_Family/HA40D_tagGCServerCreatFamilyTimes.cs

New file
@@ -0,0 +1,17 @@
using UnityEngine;

using System.Collections;



// A4 0D 通知建盟次数 #tagGCServerCreatFamilyTimes



public class HA40D_tagGCServerCreatFamilyTimes : GameNetPackBasic {

    public uint Times;    //建盟次数



    public HA40D_tagGCServerCreatFamilyTimes () {

        _cmd = (ushort)0xA40D;

    }



    public override void ReadFromBytes (byte[] vBytes) {

        TransBytes (out Times, vBytes, NetDataType.DWORD);

    }



}


 Core/NetworkPackage/ServerPack/HA4_Family/HA40D_tagGCServerCreatFamilyTimes.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 07bf433f16e1e2542ae456c04d7c61e2
timeCreated: 1560154198
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/FairyAu/FairyCreateWin.cs

@@ -15,8 +15,8 @@


    public class FairyCreateWin : Window

    {

        [SerializeField] Text textCreateLimit1;

        [SerializeField] Text textCreateLimit2;

        [SerializeField] Text m_CreateRemind1;

        [SerializeField] Text m_CreateRemind2;

        [SerializeField] Button creationClose;

        [SerializeField] InputField creationInput;

        [SerializeField] Button creationConfirm;

@@ -42,8 +42,8 @@
        {

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFariyInfo;



            textCreateLimit1.text = Language.Get("L1132", model.createFairyLv);

            textCreateLimit2.text = Language.Get("L1133", model.createFairyCost);

            m_CreateRemind1.text = Language.Get("L1132", model.createFairyLv);

            m_CreateRemind2.text = Language.Get("L1133", model.createFairyCost);

            creationInput.text = string.Empty;

        }



@@ -82,23 +82,34 @@
                return;

            }



            if (PlayerDatas.Instance.baseData.diamond >= model.createFairyCost)

            if (model.fairyCreateTimes < model.createFairyFreeCount)

            {

                CA404_tagCGPyCreatFamily creatPack = new CA404_tagCGPyCreatFamily();

                creatPack.Name = creationInput.text;

                creatPack.FakeID = 0;

                GameNetSystem.Instance.SendInfo(creatPack);

                var pak = new CA404_tagCGPyCreatFamily();

                pak.Name = creationInput.text;

                pak.FakeID = 0;

                GameNetSystem.Instance.SendInfo(pak);

            }

            else

            {

                if (VersionConfig.Get().isBanShu)

                if (PlayerDatas.Instance.baseData.diamond >= model.createFairyCost)

                {

                    SysNotifyMgr.Instance.ShowTip("GoldErr");

                    return;

                    var pak = new CA404_tagCGPyCreatFamily();

                    pak.Name = creationInput.text;

                    pak.FakeID = 0;

                    GameNetSystem.Instance.SendInfo(pak);

                }

                WindowCenter.Instance.Open<RechargeTipWin>();

                CloseImmediately();

                else

                {

                    if (VersionConfig.Get().isBanShu)

                    {

                        SysNotifyMgr.Instance.ShowTip("GoldErr");

                        return;

                    }

                    WindowCenter.Instance.Open<RechargeTipWin>();

                    CloseImmediately();

                }

            }



        }



        private void OnRefreshFariyInfo()


 System/FairyAu/FairyModel.cs

@@ -11,6 +11,8 @@
    {

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        FairyBossModel fairyBossModel { get { return ModelCenter.Instance.GetModel<FairyBossModel>(); } }



        public event Action fairyCreateTimesUpdate;

        public override void Init()

        {

            ParseConfig();

@@ -54,6 +56,7 @@
            ClearAllFairyRequest();

            m_FairyRequesteds.Clear();

            m_RequestFairyInfoCount = 0;

            fairyCreateTimes = 0;

            completeGuardSky = false;

            fairyLeagueDugeonCoolDown = false;

        }

@@ -177,16 +180,23 @@
            get;

            private set;

        }

        public int createFairyFreeCount

        {

            get;

            private set;

        }

        public readonly int changeFairyNameItem = 947;

        public int freeNotifyCount { get; private set; }

        public int changeNotifyCost { get; private set; }

        public int fairyFeastDeskNpc { get; private set; }

        public int fairyCreateTimes { get; private set; }

        void ParseConfig()

        {

            var config = FuncConfigConfig.Get("CreateFamilyMinLV");

            createFairyLv = int.Parse(config.Numerical1);

            config = FuncConfigConfig.Get("CreateFamilyNeedMoney");

            createFairyCost = int.Parse(config.Numerical1);

            createFairyFreeCount = int.Parse(config.Numerical3);

            config = FuncConfigConfig.Get("FamilyBroadcast");

            freeNotifyCount = int.Parse(config.Numerical1);

            changeNotifyCost = int.Parse(config.Numerical2);

@@ -250,6 +260,15 @@
            }

        }



        public void ReceivePackage(HA40D_tagGCServerCreatFamilyTimes package)

        {

            fairyCreateTimes = (int)package.Times;

            if (fairyCreateTimesUpdate != null)

            {

                fairyCreateTimesUpdate();

            }

        }



        public bool FairyRequested(int _fairyId)

        {

            return m_FairyRequesteds.Contains(_fairyId);