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

client_Zxw

2019-01-28 978df563e54390c30ad76e6731a1f79d31f40826

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

 Fight/Actor/HeroBehaviour.cs

@@ -477,7 +477,7 @@
            else if (m_Hero.SelectTarget != null)

            {

                GActorNpcFight _npcFight = m_Hero.SelectTarget as GActorNpcFight;

                if (_npcFight != null && _fight.CanAtked())

                if (_npcFight != null && _npcFight.CanAtked())

                {

                    _radius = _npcFight.NpcConfig.ModelRadius;

                }


 Fight/Stage/Dungeon/JadeDynastyTowerDungeonStage.cs

@@ -53,6 +53,7 @@
        }
        else
        {
            WindowCenter.Instance.Open<JadeDynastyTowerHintWin>();
            model.RequestRefreshMonster();
        }
    }

 System/FakeDungeon/FakeDemonJarDungeonStage.cs

@@ -250,7 +250,7 @@


        mission.lineID = PlayerDatas.Instance.baseData.dungeonLineId;

        mission.hurtInfo = hurts;

        mission.remainHPPer = (int)(surplusTime / totalTime * 100f);

        mission.remainHPPer = (int)(surplusTime / totalTime * 1000000f);

        mission.hpReduceSpeed = (int)(10000 / totalTime);



        dungeonModel.UpdateFakeDungeonMission(DemonJarModel.DEMONJAR_MAPID, mission);


 System/FindPrecious/DemonJarBossLifeBarWin.cs

@@ -79,7 +79,7 @@
        {

            if (inited)

            {

                var deltaHp = (long)(Time.deltaTime * model.mission.hpReduceSpeed * 0.0001f * BOSSHP_TOTAL);

                var deltaHp = (long)(Time.deltaTime * model.mission.hpReduceSpeed * 0.0001d * BOSSHP_TOTAL);

                currentHp = currentHp - deltaHp;

                if (currentHp <= 0)

                {

@@ -109,16 +109,15 @@
        {

            m_BossLifeBar.gameObject.SetActive(true);

            var npcConfig = Config.Instance.Get<NPCConfig>(TargetBriefInfo.selectedNpcId);

            currentHp = (long)(model.mission.remainHPPer * 0.01f * BOSSHP_TOTAL);

            m_BossLifeBar.SetBaseInfo(TargetBriefInfo.selectedNpcId, (ulong)currentHp, BOSSHP_TOTAL, npcConfig.NPCLV);

            currentHp = (long)(model.mission.remainHPPer * 0.000001d * BOSSHP_TOTAL);



            m_BossLifeBar.SetBaseInfo(TargetBriefInfo.selectedNpcId, (ulong)currentHp, BOSSHP_TOTAL, npcConfig.NPCLV);

            inited = true;

        }





        private void UpdateServerRemainHP()

        {

            currentHp = (long)(model.mission.remainHPPer * 0.01f * BOSSHP_TOTAL);

            currentHp = (long)(model.mission.remainHPPer * 0.000001d * BOSSHP_TOTAL);

        }



        public void RefreshBossLifeBar()


 System/KnapSack/Logic/SelectBoxItemCell.cs

@@ -33,16 +33,25 @@
            ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(id);

            this.ItemId = id;

            nameText.text = itemConfig.ItemName;

            ItemCellModel cellModel = new ItemCellModel(id, false, (ulong)BoxModel.selectDict[id],0,"",PackType.rptDeleted,true);

            ItemCellModel cellModel = new ItemCellModel(id, true, (ulong)BoxModel.selectDict[id],0,"",PackType.rptDeleted,true);

            itemBaisc.Init(cellModel);

            if (itemConfig.Effect1 == 220)

            {

                id = itemConfig.EffectValueA1;

            }

            int haveCnt = playerPack.GetItemCountByID(PackType.rptItem,id);

            if(haveCnt <= 0)

            var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);

            int haveCnt = 0;

            switch(packType)

            {

                haveCnt = ModelCenter.Instance.GetModel<RuneModel>().GetRuneCountById(id);

                case PackType.rptRunePack:

                    haveCnt = ModelCenter.Instance.GetModel<RuneModel>().GetRuneCountById(id);

                    break;

                case PackType.rptGatherSoul:

                    haveCnt = ModelCenter.Instance.GetModel<VirtualPackModel>().GetItemCountById(packType,id);

                    break;

                default:

                    haveCnt = playerPack.GetItemCountByID(packType, id);

                    break;

            }

            haveCntText.text = haveCnt.ToString();

            SetIsChoose(false);