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

client_Wu Xijin

2019-01-23 67a8f4730caef969a37638625268d3c3f59fdf49

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

 Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, January 22, 2019
//    [  Date ]:           Wednesday, January 23, 2019
//--------------------------------------------------------

using UnityEngine;
@@ -14,7 +14,9 @@
        public int skillTypeId { get ; private set ; }

        public int totalTime { get ; private set ; }

        public string[] spriteKeys;

        public string descriptionIcon { get ; private set; } 
        public string descriptionIcon { get ; private set; } 
        public Vector3 sizeDelta { get ; private set; } 
        public Vector3 position { get ; private set; } 

        public override string getKey()
        {
@@ -30,7 +32,11 @@
            

                spriteKeys = rawContents[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);

            

                descriptionIcon = rawContents[3].Trim();
                descriptionIcon = rawContents[3].Trim();

			
                sizeDelta=rawContents[4].Vector3Parse();

			
                position=rawContents[5].Vector3Parse();
            }
            catch (Exception ex)
            {

 Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d2052f17dcdee634082ca8f214df0ecd
timeCreated: 1548156734
timeCreated: 1548246768
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Fight/Stage/StageManager.cs

@@ -318,7 +318,7 @@
            }

            catch (System.Exception ex)

            {

                ExceptionCatcher.ReportException("场景加载 Step6", ex);

                ExceptionCatcher.ReportException("场景加载 Step6 执行到: " + m_InitHeroStep, ex);

            }

        }



@@ -495,8 +495,11 @@
        }

    }



    private int m_InitHeroStep = 0;



    private void InitHero()

    {

        m_InitHeroStep = 0;

        // 初始化摄像机

        if (!CameraController.Instance)

        {

@@ -504,19 +507,19 @@
            CameraController.Instance.AcceptInput = false;

            CameraController.Instance.CameraObject.enabled = false;

        }



        m_InitHeroStep = 1;

        GA_Hero _hero = PlayerDatas.Instance.hero;

        if (_hero == null)

        {

            _hero = GAMgr.Instance.RequestPlayer<GA_Hero>(PlayerDatas.Instance.PlayerId, E_ActorGroup.User, null);

        }



        m_InitHeroStep = 2;

        _hero.State = E_ActorState.Idle;

        _hero.ActorInfo.ResetHp((int)PlayerDatas.Instance.baseData.HP, -1, (int)PlayerDatas.Instance.extersion.MaxHP);

        _hero.CalculateMoveSpeed((ushort)PlayerDatas.Instance.extersion.SpeedValue);

        _hero.CalculateAtkSpeed(PlayerDatas.Instance.extersion.battleValEx1);

        _hero.InitBornPos(PlayerDatas.Instance.baseData.PosX, PlayerDatas.Instance.baseData.PosY);



        m_InitHeroStep = 3;

        CameraController.Instance.SetLookTarget(_hero.Root);

        CameraController.Instance.Apply();



@@ -525,7 +528,7 @@


        ItemModel _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retClothes);

        ItemModel _fashion = _equipModel.GetItemModelByIndex((int)RoleEquipType.retFashionClothes);



        m_InitHeroStep = 4;

        if (_fashion != null)

        {

            _hero.SwitchClothes((uint)_fashion.itemInfo.ItemID, (int)RoleEquipType.retFashionClothes);

@@ -538,7 +541,7 @@
        {

            _hero.SwitchClothes(0);

        }



        m_InitHeroStep = 5;

        _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retWeapon);

        _fashion = _equipModel.GetItemModelByIndex((int)RoleEquipType.retFashionWeapon);



@@ -555,6 +558,7 @@
            _hero.SwitchWeapon(0);

        }



        m_InitHeroStep = 6;

        _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retWeapon2);

        _fashion = _equipModel.GetItemModelByIndex((int)RoleEquipType.retFashionWeapon2);



@@ -570,6 +574,7 @@
        {

            _hero.SwitchSecondary(0);

        }

        m_InitHeroStep = 7;



        _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retWing);



@@ -578,6 +583,7 @@
            _hero.SwitchWing((uint)_itemModel.itemInfo.ItemID);

        }



        m_InitHeroStep = 8;

        var _mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

        if (_mapConfig.CanRide == 1)

        {

@@ -592,6 +598,7 @@
                }

            }

        }

        m_InitHeroStep = 9;



        _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retSpiritAnimal);



@@ -600,12 +607,17 @@
            _hero.SwitchGuard((uint)_itemModel.itemInfo.ItemID);

        }



        m_InitHeroStep = 10;



        _hero.SyncSuitEffect();



        m_InitHeroStep = 11;

        _hero.IdleImmediate();



        _hero.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        _hero.CheckAncientHeadUp();



        m_InitHeroStep = 12;

        var titleId = 0;

        if (PlayerDatas.Instance.baseData.MapID != 31160)

        {

@@ -615,6 +627,7 @@
        }

        _hero.SwitchTitle((uint)titleId);



        m_InitHeroStep = 13;

        // 判断buff

        if (StatusMgr.Instance.IsExist(PlayerDatas.Instance.PlayerId, StatusMgr.Instance.redNameBuffID))

        {

@@ -623,6 +636,7 @@


        _hero.RequestLight();



        m_InitHeroStep = 14;

        PlayerDatas.Instance.hero = _hero;



        var _preloadEffectList = GeneralDefine.PreloadSkillEffect[_hero.JobSetup.Job - 1];

@@ -633,6 +647,7 @@
                InstanceResourcesLoader.PreloadSkillEffect(_id);

            }

        }

        m_InitHeroStep = 15;

    }



    private string GetAssetBundleNameByStageId(int stageID, int mapResID)


 System/JadeDynastySkill/JadeDynastySkillWin.cs

@@ -126,6 +126,9 @@
                    var config = Config.Instance.Get<SkillFrameAnimationConfig>(model.selectSkill);

                    m_SkillFrame.SetSprites(sprites, (float)config.totalTime / 1000);

                    m_SkillDescriptionIcon.SetSprite(config.descriptionIcon);

                    var rt = m_SkillFrame.transform as RectTransform;

                    rt.sizeDelta = config.sizeDelta;

                    rt.localPosition = config.position;

                }

            }

        }


 UI/Common/FrameEffect.cs

@@ -85,8 +85,8 @@
                timer = 0f;
                tempSumTime = sumTime;

                m_Behaviour.sprite = m_Sprites[index];
                m_Behaviour.overrideSprite = m_Sprites[index];
                m_Behaviour.SetNativeSize();
            }

        }