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

client_Zxw

2018-11-24 1d76c523ab243e8da20ba1f005801e1712e47997

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

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -466,6 +466,12 @@
#endif

            return packageInstance;

        }

        else

        {

#if UNITY_EDITOR

            NetPkgCtl.AddNetPkg(vStr, NetPkgType.Server, string.Empty, string.Empty, null);

#endif

        }

        return null;

    }




 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs

@@ -67,6 +67,7 @@
                    break;

                case E_NpcType.Fight:

                case E_NpcType.FMBoss:

                case E_NpcType.FightAssist:



                    if (_npcConfig.Country == 1)

                    {


 Fight/GameActor/GA_NpcFightNorm.cs

@@ -257,7 +257,8 @@
            && NpcConfig.NPCType != (int)E_NpcType.Func

            && NpcConfig.NPCType != (int)E_NpcType.Collect

            && NpcConfig.NPCType != (int)E_NpcType.Pet

            && !ActorInfo.serverDie;

            && !ActorInfo.serverDie

            && NpcConfig.NPCType != (int)E_NpcType.FightAssist;

    }



    public override bool CanAtkedRotate()


 System/Dungeon/AssistPlayerCell.cs

@@ -13,12 +13,14 @@
        [SerializeField] Image headIcon;

        [SerializeField] Image realmIcon;

        [SerializeField] Button helpBtn;

        [SerializeField] Image helpBgImg;

        [SerializeField] Text helpText;

        [SerializeField] Button goldHelpBtn;

        [SerializeField] Text goldHelpText;

        [SerializeField] Text fightPowerText;

        [SerializeField] Text rewardText;

        [SerializeField] Image relationImg;

        [SerializeField] Text jobNameText;



        FriendsModel friendsModel

        {

@@ -30,7 +32,6 @@


        private void OnEnable()

        {

            helpBtn.AddListener(ClickHelp);

            assistModel.UpdataAssistPlayerEvent += UpdateAssistState;

        }



@@ -54,6 +55,8 @@
            helpBtn.gameObject.SetActive(!playerInfo.IsGoldAssist);

            goldHelpBtn.gameObject.SetActive(playerInfo.IsGoldAssist);

            UpdateAssistState(playerInfo.PlayerID);

            jobNameText.text = OccupationNameConfig.GetOccupationName(playerInfo.Job,1);

            goldHelpText.text = assistModel.goldAssistPlayer.ToString();

            int nirvanaLv = playerInfo.LV - friendsModel.OpenGreatLV;

            lvIcon.gameObject.SetActive(nirvanaLv > 0);

            if (nirvanaLv > 0)

@@ -68,15 +71,19 @@


        public void UpdateAssistState(int playerId)

        {

            helpBtn.RemoveAllListeners();

            if (playerInfo == null || playerInfo.PlayerID != playerId) return;



            if(playerInfo.IsAssist)

            {

                helpText.text = "已召唤";

                helpBgImg.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

            }

            else

            {

                helpBtn.AddListener(ClickHelp);

                helpText.text = "召唤";

                helpBgImg.material = MaterialUtility.GetUIDefaultGraphicMaterial();

            }

        }




 System/Dungeon/DungeonAssistModel.cs

@@ -13,6 +13,10 @@
        public string helpInfoLocalSave { get; private set; }

        public List<string> helpInfolist { get; private set; }

        public event Action UpdateResultEvent;



        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

        FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }



        public override void Init()

        {

            ParseFuncConfig();

@@ -36,6 +40,31 @@
        public override void UnInit()

        {

           

        }



        public bool TryGetFreeRefresh(out int remainNum)

        {

            if (assistRefreshNum < freeRefreshNum)

            {

                remainNum = freeRefreshNum - assistRefreshNum;

            }

            else

            {

                remainNum = (freeRefreshNum + goldRefreshNum) - assistRefreshNum;

            }

            return assistRefreshNum < freeRefreshNum;

        }



        public RelatedToPlayer GetRelatedToPlayer(int playerId)

        {

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

            bool isAlly = fairyModel.InSameFairy(playerId);



            if (isFriend && isAlly) return RelatedToPlayer.FriendAndAlly;

            if (isFriend) return RelatedToPlayer.Friend;

            if (isAlly) return RelatedToPlayer.Ally;



            return RelatedToPlayer.None;

        }



        #region 本地数据

@@ -229,19 +258,6 @@
        }

        #endregion



        public bool TryGetFreeRefresh(out int remainNum)

        {

            if(assistRefreshNum < freeRefreshNum)

            {

                remainNum = freeRefreshNum - assistRefreshNum;

            }

            else

            {

                remainNum = (freeRefreshNum + goldRefreshNum) - assistRefreshNum;

            }

            return assistRefreshNum < freeRefreshNum;

        }



        public class AssistResult

        {

            public DateTime createTime;

@@ -357,6 +373,8 @@
            public int RealmLV { get; private set; }           // 玩家境界等级

            public int FightPower { get; private set; }           // 玩家战力

            public int IsNeedGold { get; private set; }           // 是否需要仙玉召唤

            public RelatedToPlayer relatedToPlayer { get; private set;} //与玩家的关系



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



            public AssistPlayerInfo(HB207_tagMCHelpBattleList.tagMCHelpBattlePlayer battlePlayer)

@@ -372,9 +390,11 @@
                    RealmLV = battlePlayer.RealmLV;

                    FightPower = (int)battlePlayer.FightPower;

                    IsNeedGold = battlePlayer.IsNeedGold;

                    relatedToPlayer = assistModel.GetRelatedToPlayer(PlayerID);

                }

                else

                {

                    relatedToPlayer = RelatedToPlayer.None;

                    int mapId = PlayerDatas.Instance.baseData.MapID;

                    int lineId = PlayerDatas.Instance.baseData.dungeonLineId;

                    var battleConfig = assistModel.GetHelpBattleConfig(mapId,lineId);

@@ -409,5 +429,13 @@
                }

            }

        }



        public enum RelatedToPlayer

        {

            None,//没关系

            Friend, //好友

            Ally, //盟友

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

        }

    }

}


 System/Dungeon/DungeonAssistPlayerWin.cs

@@ -102,12 +102,12 @@
            goldRefreshBtn.gameObject.SetActive(!isFree);

            if(isFree)

            {

                freeRefreshText.text = StringUtility.Contact("刷新", "(剩余", remainNum, "次)");

                freeRefreshText.text = StringUtility.Contact("剩余", remainNum, "次");

            }

            else

            {

                goldRefreshCostMoneyText.text = assistModel.refreshCostMoney.ToString(); 

                goldRefreshRemianNumText.text = StringUtility.Contact("绑玉刷新", "(剩余", remainNum, "次)");

                goldRefreshRemianNumText.text = StringUtility.Contact("剩余", remainNum, "次");

            }

        }




 System/Dungeon/DungeonAssistWin.cs

@@ -13,6 +13,7 @@
        [SerializeField] Button closeBtn;

        [SerializeField] Button storeBtn;

        [SerializeField] Button registerBtn;

        [SerializeField] Image registerBgImg;



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



@@ -26,12 +27,11 @@
        {

            closeBtn.AddListener(CloseClick);

            storeBtn.AddListener(ClickStore);

            registerBtn.AddListener(ClickAssistRegister);



        }



        protected override void OnPreOpen()

        {

            assistModel.UpdateCheckInResultEvent += UpdateCheckIn;

            assistModel.UpdateResultEvent += UpdateResult;

            SetDisplay();

        }

@@ -44,6 +44,7 @@
        protected override void OnPreClose()

        {

            assistModel.UpdateResultEvent -= UpdateResult;

            assistModel.UpdateCheckInResultEvent -= UpdateCheckIn;

        }



        protected override void OnAfterClose()

@@ -76,8 +77,29 @@
            CreateResultCell();

        }



        private void UpdateCheckIn()

        {

            registerBtn.RemoveAllListeners();

            if(assistModel.IsCheckInOk)

            {



            }

            else

            {

                registerBtn.AddListener(ClickAssistRegister);

            }

        }



        private void ClickAssistRegister()

        {

            if(!assistModel.IsCheckInOk)

            {

                assistModel.SendAssistCheckIn();

            }

            else

            {



            }

          

        }




 System/PlayerDead/ReliveWin.cs

@@ -94,7 +94,7 @@


        protected override void OnPreClose()

        {

           
            StopAllCoroutines();

        }



        protected override void OnAfterClose()


 System/Treasure/DemonDungeonLabel.cs

New file
@@ -0,0 +1,19 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Snxxz.UI

{

    public class DemonDungeonLabel : MonoBehaviour

    {

        [SerializeField] TextMesh m_Label1;

        [SerializeField] TextMesh m_Label2;



        public void Display(string label1, string label2)

        {

            m_Label1.text = label1;

            m_Label2.gameObject.SetActive(!string.IsNullOrEmpty(label2));

            m_Label2.text = label2;

        }

    }

}


 System/Treasure/DemonDungeonLabel.cs.meta

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

 System/Treasure/DemonTreasureWin.cs

@@ -59,6 +59,8 @@


        public static float expand = 1.05f;



        bool treasureTweening = false;



        AnimationStep m_Step = AnimationStep.None;

        AnimationStep step

        {

@@ -72,6 +74,8 @@
                }

            }

        }



        float timer = 0f;

        #region Built-in

        protected override void BindController()

        {

@@ -87,6 +91,7 @@
        {

            expand = m_Expand;

            m_Step = AnimationStep.None;

            treasureTweening = false;

        }



        protected override void OnActived()

@@ -95,6 +100,7 @@
            model.treasureSelectedEvent += TreasureSelectedEvent;

            model.treasureStateChangeEvent += TreasureStateChangeEvent;

            model.demonTreasureDungeonUpdate += DemonTreasureDungeonUpdate;

            TreasureBaseWin.allowSelectTreasure += AllowSelectTreasure;

            Display();



            Treasure treasure;

@@ -123,13 +129,35 @@
            model.treasureSelectedEvent -= TreasureSelectedEvent;

            model.treasureStateChangeEvent -= TreasureStateChangeEvent;

            model.demonTreasureDungeonUpdate -= DemonTreasureDungeonUpdate;

            TreasureBaseWin.allowSelectTreasure -= AllowSelectTreasure;

            model.SetTreasureUnlockShow(TreasureCategory.Demon, 0);

            treasureTweening = false;

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        protected override void LateUpdate()

        {

            base.LateUpdate();

            timer += Time.deltaTime;

            if (timer > 1f)

            {

                timer = 0f;

                treasureTweening = false;

            }

        }



        private bool AllowSelectTreasure(int treasureId)

        {

            if (NewBieCenter.Instance.inGuiding || treasureTweening)

            {

                return false;

            }

            return true;

        }



        private void ViewProperty()

        {

@@ -200,7 +228,12 @@
                case AnimationStep.None2Collect:

                    m_ContainerDungeons.gameObject.SetActive(true);

                    m_DungeonAlphaTween.Play();

                    UI3DTreasureSelectStage.Instance.Tween(null);

                    treasureTweening = true;

                    timer = 0f;

                    UI3DTreasureSelectStage.Instance.Tween(()=> 
                    {

                        treasureTweening = false;

                    });

                    m_DescriptionTween.SetStartState();

                    m_NameTween.SetStartState();

                    m_SkillTween.SetStartState();

@@ -209,7 +242,12 @@
                case AnimationStep.Lock2Collect:

                    m_ContainerDungeons.gameObject.SetActive(true);

                    m_DungeonAlphaTween.Play();

                    UI3DTreasureSelectStage.Instance.Tween(null);

                    treasureTweening = true;

                    timer = 0f;

                    UI3DTreasureSelectStage.Instance.Tween(() =>

                    {

                        treasureTweening = false;

                    });

                    m_DescriptionTween.Play(true);

                    m_NameTween.Play(true);

                    m_SkillTween.Play(true);


 System/Treasure/TreasureComponent.cs

@@ -31,7 +31,7 @@
        private Transform bottom;

        private Transform name;

        private TextMesh condition;

        private TextMesh treasureLabel;

        private DemonDungeonLabel treasureLabel;



        #region 红点

        private Transform potentialRed;

@@ -705,7 +705,8 @@
                return;

            }



            string displayStr = string.Empty;

            string label1 = string.Empty;

            string label2 = string.Empty;

            switch (category)

            {

                case TreasureCategory.Demon:

@@ -715,14 +716,15 @@
                        switch (_treasure.state)

                        {

                            case TreasureState.Collected:

                                displayStr = Language.Get("DemonTreasureHighest");

                                label1 = ":";

                                break;

                            case TreasureState.Collecting:

                                TreasureDungeon treasureDungeon;

                                if (model.TryGetTreasureDungeon(treasureId, out treasureDungeon))

                                {

                                    displayStr = UIHelper.ReplaceNewLine(Language.Get("DemonTreasureChallenge",

                                        treasureDungeon.currentLevel, treasureDungeon.maxLevel));

                                    label1 = "+";

                                    label2 = StringUtility.Contact("(", treasureDungeon.currentLevel,

                                        "/", treasureDungeon.maxLevel, ")");

                                }

                                break;

                            case TreasureState.Locked:

@@ -732,7 +734,7 @@
                    break;

            }



            if (string.IsNullOrEmpty(displayStr))

            if (string.IsNullOrEmpty(label1))

            {

                return;

            }

@@ -744,14 +746,14 @@
                pool = GameObjectPoolManager.Instance.RequestPool(_prefab);

                m_LabelPoolDict.Add(category, pool);

            }

            treasureLabel = pool.Request().GetComponent<TextMesh>();

            treasureLabel = pool.Request().GetComponent<DemonDungeonLabel>();

            treasureLabel.gameObject.SetActive(true);

            treasureLabel.transform.SetParent(root);

            treasureLabel.transform.localPosition = Vector3.zero;

            treasureLabel.transform.LookAt(UI3DTreasureSelectStage.Instance.center);

            treasureLabel.transform.localPosition = new Vector3(0, -1.48f, 0f);

            treasureLabel.transform.localPosition = new Vector3(0, -1.73f, 0f);

            treasureLabel.transform.localScale = new Vector3(-1, 1, 1);

            treasureLabel.text = displayStr;

            treasureLabel.Display(label1, label2);

            LayerUtility.SetLayer(treasureLabel.gameObject, LayerUtility.UILayer, true);

        }




 Utility/EnumHelper.cs

@@ -115,7 +115,8 @@
    TouchKilled = 17,//守护     17

    FMBoss = 18,// 封魔坛boss    18

    BreakableObj = 19,//场景可被攻击物     19

    OpenWorldMap = 20,// 打开世界大地图

    FightAssist = 20,// 助战

    OpenWorldMap = 99,// 打开世界地图

}



public enum E_MovingState

@@ -319,7 +320,7 @@
    PersonalBoss = 25,

    ElderGodArea = 26,

    FairyGrabBoss = 27,

    KillMonster=28,

    KillMonster = 28,

}



public enum ActivityPrepareType

@@ -1111,9 +1112,9 @@
    MarketPutawayPwd = 24,

    DemonJar = 25,

    DemonJarDouble = 28,

    BindJadeWheel=30,

    BindJadeWheel = 30,

    PrayForDrug = 31,

    DemonJarAuto=32,

    DemonJarAuto = 32,

}