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

client_Wu Xijin

2018-11-27 25a4e0676655bfe093a5fe48b312843f8e5a008e

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

 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0132_tagCreateRoleSucess.cs

@@ -1,5 +1,7 @@
public class DTC0132_tagCreateRoleSucess : DtcBasic
{
    public static bool isCreateRole = false;

    public override void Done(GameNetPackBasic vNetPack)
    {
        base.Done(vNetPack);
@@ -11,6 +13,6 @@
            return;
        }

        SDKUtility.Instance.CreateRoleOk(_package.PlayerID.ToString(), _package.PlayerName.Trim());
        isCreateRole = true;
    }
}

 Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA124_tagMCPlayerInfo.cs

@@ -14,6 +14,14 @@
        base.Done(vNetPack);
        var package = vNetPack as HA124_tagMCPlayerInfo;
        TimeUtility.OnRefreshCreateRoleTime(package);

        if(DTC0132_tagCreateRoleSucess.isCreateRole)
        {
            DTC0132_tagCreateRoleSucess.isCreateRole = false;
            SDKUtility.Instance.CreateRoleOk(PlayerDatas.Instance.PlayerId.ToString(),
                                             PlayerDatas.Instance.baseData.PlayerName.Trim(),
                                             TimeUtility.CreateSeconds.ToString());
        }
    }

}

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

@@ -34,7 +34,7 @@
        {

            GA_NpcFightZZPlayer.s_UnCreateObjIDList.Remove(vNetData.ObjID);

            

            Debug.LogFormat("移除: {0}", vNetData.ObjID);

            // Debug.LogFormat("移除: {0}", vNetData.ObjID);

            var _zzPlayer = GAMgr.Instance.GetBySID(vNetData.ObjID) as GA_NpcFightZZPlayer;

            if (_zzPlayer != null)

            {


 Core/SDK/SDKUtility.cs

@@ -998,7 +998,7 @@
        SendMessageToSDK(m_Json);

    }



    public void CreateRoleOk(string roleID, string roleName)

    public void CreateRoleOk(string roleID, string roleName,string time)

    {

        m_Json.Clear();

        m_Json["code"] = CodeU2A.CreateRole;

@@ -1013,6 +1013,7 @@
        m_Json["money"] = PlayerDatas.Instance.baseData.Gold.ToString();

        m_Json["gameName"] = VersionConfig.Get().productName;

        m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();

        m_Json["createTime"] = time;

        SendMessageToSDK(m_Json);

    }



@@ -1050,6 +1051,7 @@
        m_Json["money"] = PlayerDatas.Instance.baseData.Gold.ToString();

        m_Json["gameName"] = VersionConfig.Get().productName;

        m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();

        m_Json["levelUpTime"] = TimeUtility.AllSeconds.ToString();



        SendMessageToSDK(m_Json);

    }


 Fight/GameActor/GA_Hero.cs

@@ -332,7 +332,6 @@


        Behaviour.StopKillUntilDieAI();



        SwitchGodWeapon(1, PlayerDatas.Instance.baseData.godWeaponLV_1);

        SwitchGodWeapon(4, PlayerDatas.Instance.baseData.godWeaponLV_4);

    }



@@ -346,7 +345,7 @@
            MaterialUtility.SwitchXrayShader(m_SecondaryMaterial, true);

        }

        GameObjectPoolManager.Instance.AddDontDestroyGoInstID(secondary.GetInstanceID());

        SwitchGodWeapon(3, PlayerDatas.Instance.baseData.godWeaponLV_3);

        SwitchGodWeapon(1, PlayerDatas.Instance.baseData.godWeaponLV_1);

    }



    protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)


 Fight/GameActor/GA_NpcFightZZPlayer.cs

@@ -60,7 +60,7 @@
                string[] _values = _valueInfo.Split('|');
                int _playerId = int.Parse(_values[0]);

                // Debug.LogFormat("-------- _playerId: " + _playerId);
                 //Debug.LogFormat("-------- _playerId: " + _playerId);

                SyncHelpBattle(_playerId);
            }
@@ -71,7 +71,7 @@
    {
        if (m_ViewPlayerData == null && (playerID > 100))
        {
            // Debug.LogFormat("没有: {0} 信息数据, 这里获取", playerID);
            //Debug.LogFormat("没有: {0} 信息数据, 这里获取", playerID);
            CA212_tagCMViewPlayerInfo pak = new CA212_tagCMViewPlayerInfo();
            pak.PlayerID = (uint)playerID;
            GameNetSystem.Instance.SendInfo(pak);
@@ -164,7 +164,8 @@
                _wingId = _item.ItemID;
            }
        }

        
        //Debug.LogFormat("Name: {0}", ActorInfo.PlayerName);
        //Debug.LogFormat("_clothesId: {0}, _weaponId: {1}, _secondaryId: {2}, _wingId: {3}", _clothesId, _weaponId, _secondaryId, _wingId);

        if (_clothesId <= 0)
@@ -212,6 +213,13 @@

    private void OnRevA705(HA705_tagSCQueryPlayerCacheResult package)
    {
        var _valueInfo = LocalSave.GetString("GA_NpcFightZZPlayer_" + m_H0406.ObjID);
        string[] _values = _valueInfo.Split('|');
        int _playerId = int.Parse(_values[0]);
        if(package.PlayerID != _playerId)
        {
            return;
        }
        // Debug.Log("延迟获取了数据: id为 " + package.PlayerID);
        DTCA705_tagSCQueryPlayerCacheResult.OnRevPackage -= OnRevA705;

@@ -301,7 +309,6 @@

        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
            SwitchGodWeapon(4, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(4));
        }
    }
@@ -321,11 +328,8 @@
    {
        Renderer _renderer = weapon.GetComponentInChildren<Renderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);

        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(3, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(3));
        }
        
        SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
    }

    protected override void OnPutonWing(uint wingItemID, GameObject wing)

 Fight/GameActor/GA_NpcFunc.cs

@@ -68,6 +68,13 @@
            _needHide = false;

        }



        // 这里针对指定的NPC特殊矫正位置

        if (GeneralDefine.NpcPosOffset.ContainsKey(NpcConfig.NPCID))

        {

            Pos = GeneralDefine.NpcPosOffset[NpcConfig.NPCID];

            //Debug.Log("矫正位置: " + Pos);

        }



        if (_needHide)

        {

            Pos = Constants.Special_Hide_Position;


 Fight/GameActor/GA_Player.cs

@@ -321,7 +321,6 @@
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);

        MaterialUtility.SwitchXrayShader(m_Material, false);



        SwitchGodWeapon(1, (int)m_H0434.ExAttr15);

        SwitchGodWeapon(4, (int)m_H0434.ExAttr18);

    }



@@ -333,7 +332,7 @@
            _renderer.gameObject.SetLayer(LayerUtility.Player, false);

            MaterialUtility.SwitchXrayShader(m_SecondaryMaterial, false);

        }

        SwitchGodWeapon(3, (int)m_H0434.ExAttr17);

        SwitchGodWeapon(1, (int)m_H0434.ExAttr15);

    }



    protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)


 Fight/GameActor/GActorNpcNoFight.cs

@@ -69,12 +69,6 @@


        RequestShadow();



        // 这里针对指定的NPC特殊矫正位置

        if (GeneralDefine.NpcPosOffset.ContainsKey(NpcConfig.NPCID))

        {

            Pos = GeneralDefine.NpcPosOffset[NpcConfig.NPCID];

        }



        // 执行挖洞逻辑

        if (NpcConfig.Dig == 1)

        {

@@ -220,7 +214,6 @@


            OnMainModelLoaded();

        }



    }



    protected virtual void OnMainModelLoaded() { }


 Lua/Gen/SDKUtilityWrap.cs

@@ -745,8 +745,9 @@
                {
                    string _roleID = LuaAPI.lua_tostring(L, 2);
                    string _roleName = LuaAPI.lua_tostring(L, 3);
                    string _time = LuaAPI.lua_tostring(L, 4);
                    
                    gen_to_be_invoked.CreateRoleOk( _roleID, _roleName );
                    gen_to_be_invoked.CreateRoleOk( _roleID, _roleName, _time );
                    
                    
                    

 Lua/Gen/SDKUtilityWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b28dd16e04195c84ab4833cc1ccfd94e
timeCreated: 1543068715
timeCreated: 1543311638
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/BossShow/BossShowModel.cs

@@ -129,6 +129,28 @@
            }

        }



        public void StartBossShow(int mapId, int lineId)

        {

            if (BossShowing)

            {

                return;

            }

            var configs = Config.Instance.GetAllValues<ActorShowConfig>();

            ActorShowConfig _showModel = null;

            foreach (var config in configs)

            {

                if (config.MapID == mapId && config.line == lineId)

                {

                    _showModel = config;

                    break;

                }

            }

            if (_showModel != null)

            {

                SnxxzGame.Instance.StartCoroutine(Co_StartBossShow(_showModel));

            }

        }



        public void StopBossShow()

        {

            if (!BossShowing)


 System/Dungeon/DungeonAssistModel.cs

@@ -145,6 +145,8 @@
            if (vipDict == null) return false;



            int vipLv = PlayerDatas.Instance.baseData.VIPLv;

            int vipMaxLv = GetMaxVipPrivilegeEffectLv(VipPrivilegeType.AssistXianYuanCoinsAdd);

            bool isMaxVipLv = vipLv >= vipMaxLv ? true : false;

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

            vipLvlist.Sort();

            int curAddCoins = 0;

@@ -152,32 +154,26 @@
            {

                curAddCoins = vipDict[vipLv];

            }

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

            {

                var lv = vipLvlist[i];

                var addCoins = vipDict[lv];

                if (lv > vipLv && addCoins > curAddCoins)

                {

                    nextVipLv = lv;

                    coins = addCoins;

                    return false;

                }

            }



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

            if(!isMaxVipLv)

            {

                var lv = vipLvlist[i];

                var addCoins = vipDict[lv];

                if(addCoins > 0)

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

                {

                    if(vipLv >= lv)

                    var lv = vipLvlist[i];

                    var addCoins = vipDict[lv];

                    if (lv > vipLv && addCoins > curAddCoins)

                    {

                        nextVipLv = lv;

                        coins = addCoins;

                        return true;

                        return false;

                    }

                    break;

                }

            }

            else

            {

                nextVipLv = vipLv;

                coins = vipDict[vipMaxLv];

                return true;

            }

            return false;

        }

@@ -190,6 +186,8 @@
            if (vipDict == null) return false;



            int vipLv = PlayerDatas.Instance.baseData.VIPLv;

            int vipMaxLv = GetMaxVipPrivilegeEffectLv(VipPrivilegeType.AssistXianYuanCoinsRatioAdd);

            bool isMaxVipLv = vipLv >= vipMaxLv ? true : false;

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

            vipLvlist.Sort();

            int curAddRatio = 0;

@@ -197,34 +195,52 @@
            {

                curAddRatio = vipDict[vipLv];

            }

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

            {

                var lv = vipLvlist[i];

                var addRatio = vipDict[lv];

                if (lv > vipLv && addRatio > curAddRatio)

                {

                    nextVipLv = lv;

                    ratio = (float)addRatio/100;

                    return false;

                }

            }



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

            if(!isMaxVipLv)

            {

                var lv = vipLvlist[i];

                var addRatio = vipDict[lv];

                if (addRatio > 0)

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

                {

                    if (vipLv >= lv)

                    var lv = vipLvlist[i];

                    var addRatio = vipDict[lv];

                    if (lv > vipLv && addRatio > curAddRatio)

                    {

                        nextVipLv = lv;

                        ratio = (float)addRatio / 100;

                        return true;

                        return false;

                    }

                    break;

                }

            }

            else

            {

                nextVipLv = vipMaxLv;

                ratio = (float)vipDict[vipMaxLv] / 100;

                return true;

            }

            return false;

        }



        public int GetMaxVipPrivilegeEffectLv(VipPrivilegeType type)

        {

            var vipDict = VipPrivilegeConfig.GetVipPrivilegeDic(type);

            if (vipDict == null) return 0;



            int recordEffect = 0;

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

            vipLvlist.Sort();

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

            {

                int vipLv = vipLvlist[i];

                int effect = vipDict[vipLv];

                if(effect >= recordEffect)

                {

                    recordEffect = effect;

                }

                else

                {

                    return vipLv;

                }

            }

            return 0;

        }



        public RelatedToPlayer GetRelatedToPlayer(int playerId)

@@ -386,7 +402,12 @@
                string[] infos = helpInfolist[i].Split('|');

                if(infos != null && infos.Length >= 3)

                {

                    helpInfolist[i] = StringUtility.Contact(infos[0], "|", infos[1], "|", false);

                    bool isNew = true;

                    bool.TryParse(infos[2], out isNew);

                    if(isNew)

                    {

                        helpInfolist[i] = StringUtility.Contact(infos[0], "|", infos[1], "|", false);

                    }

                }

            }

            UpdateMainAssistRedpoint();

@@ -567,8 +588,8 @@
        public string ToDisplay()

        {

            var severTime = TimeUtility.ServerNow;

            return StringUtility.Contact(severTime.Year.ToString("D2"), ":", severTime.Month.ToString("D2"), ":"

                , severTime.Day.ToString("D2"), ":",severTime.Hour.ToString("D2"), ":",severTime.Minute.ToString("D2"),":"

            return StringUtility.Contact(severTime.Year.ToString("D2"), "-", severTime.Month.ToString("D2"), "-"

                , severTime.Day.ToString("D2")," ",severTime.Hour.ToString("D2"), ":", severTime.Minute.ToString("D2"), ":"

                , severTime.Second.ToString("D2"));

        }




 System/Dungeon/DungeonAssistWin.cs

@@ -167,10 +167,7 @@


        private void ClickStore()

        {

            CloseClick();

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StoreFunc5);

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.XianYuanCoinsStore);

        }





    }

}


 System/Dungeon/TreasureDungeonMissionHintWin.cs

@@ -138,10 +138,7 @@


        private void ChallengeNextEvent()

        {

            if (demonTreasureDungeon)

            {

                DisplayDemonTreasureDungeon();

            }

            Display();

        }



        void DisplayNormalTreasureDungeon()


 System/Role/AutoHammerWin.cs

@@ -231,19 +231,20 @@
                return;

            }

            model.autoHammerLevel = targetLevel;

            var config = GodWeaponConfig.GetConfig(selectGodWeaponType, 1);

            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),

                Language.Get("AutoHammerConfirm", cost, config.Name, targetLevel), (bool isOk) =>

                {

                    if (isOk)

                    {

                        if (onConfirm != null)

                        {

                            onConfirm(true);

                        }

                        CloseImmediately();

                    }

                });

            //var config = GodWeaponConfig.GetConfig(selectGodWeaponType, 1);

            //ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),

            //    Language.Get("AutoHammerConfirm", cost, config.Name, targetLevel), (bool isOk) =>

            //    {

            //        if (isOk)

            //        {

            //            
            //        }

            //    });

            if (onConfirm != null)

            {

                onConfirm(true);

            }

            CloseImmediately();

        }



        private void OnNumConfirm(bool isOk)


 System/Treasure/DemonTreasureWin.cs

@@ -433,6 +433,10 @@


        private void TreasureStateChangeEvent(int id)

        {

            if (!model.serverInited)

            {

                return;

            }

            if (id == model.selectedTreasure)

            {

                DisplaySkill();

@@ -452,6 +456,10 @@


        private void DemonTreasureDungeonUpdate(int id)

        {

            if (!model.serverInited)

            {

                return;

            }

            if (id == model.selectedTreasure)

            {

                DisplayDungeons();


 System/Treasure/TreasureComponent.cs

@@ -85,6 +85,8 @@
                UpdateParam();

                RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

                RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;

                model.demonTreasureDungeonUpdate -= DemonTreasureDungeonUpdate;

                model.demonTreasureDungeonUpdate += DemonTreasureDungeonUpdate;

            }

            else

            {

@@ -99,6 +101,7 @@
                RecycleTreasureLabel();

                RecycleHighestEffect();

                RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

                model.demonTreasureDungeonUpdate -= DemonTreasureDungeonUpdate;

            }

            interactProcessor.SetActive(_active);

        }

@@ -758,6 +761,42 @@
            LayerUtility.SetLayer(treasureLabel.gameObject, LayerUtility.UILayer, true);

        }



        private void DemonTreasureDungeonUpdate(int id)

        {

            if (id == treasureId)

            {

                DisplayTreasureLabel();

            }

        }



        void DisplayTreasureLabel()

        {

            if (category == TreasureCategory.Demon)

            {

                if (treasureLabel != null)

                {

                    Treasure _treasure;

                    if (model.TryGetTreasure(treasureId, out _treasure))

                    {

                        switch (_treasure.state)

                        {

                            case TreasureState.Collected:

                                treasureLabel.Display(":", string.Empty);

                                break;

                            case TreasureState.Collecting:

                                TreasureDungeon treasureDungeon;

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

                                {

                                    treasureLabel.Display("+", StringUtility.Contact("(", treasureDungeon.currentLevel,

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

                                }

                                break;

                        }

                    }

                }

            }

        }



        void RecycleTreasureLabel()

        {

            if (m_LabelPoolDict.ContainsKey(category) && treasureLabel != null)


 System/WindowJump/WindowJumpMgr.cs

@@ -300,6 +300,7 @@
            case JumpUIType.StoreFunc3:

            case JumpUIType.StoreFunc4:

            case JumpUIType.StoreFunc5:

            case JumpUIType.XianYuanCoinsStore:

                SetJumpLogic<StoreWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.VipRechargeFunc1:

@@ -591,6 +592,12 @@
                break;

            case JumpUIType.DungeonAssitCheckIn:

                SetJumpLogic<DungeonAssistWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.LifeMagicianPreview:

            case JumpUIType.AttackMagicianPreview:

            case JumpUIType.DefenceMagicianPreview:

                GodWeaponPreviewWin.selectGodWeaponType = int.Parse(_tagWinSearchModel.SelectActive);

                SetJumpLogic<GodWeaponPreviewWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.FaBaoSoul_BenYuan:

            case JumpUIType.FaBaoSoul_FengMo:

@@ -1483,6 +1490,10 @@
    Team_EmperorRelic = 256, //组队列表-娲皇遗迹标签

    OpenServer_AccumulateRecharge = 257, //精彩活动—累计充值界面

    DungeonAssitCheckIn = 258, //副本助战登记

    LifeMagicianPreview = 260, //生命神兵预览界面

    AttackMagicianPreview = 261, //攻击神兵预览界面

    DefenceMagicianPreview = 262, //护盾神兵预览界面

    XianYuanCoinsStore = 263, // 仙缘币商城返回主界面

    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

    GyzTs = 1003,//鬼牙刃功法提升界面


 Utility/TimeUtility.cs

@@ -123,6 +123,14 @@
        }

    }



    public static int CreateSeconds

    {

        get

        {

            return (ServerNow - createRoleTimeTail).Seconds;

        }

    }



    public static event Action OnCreateRoleTimeRefresh;

    public static void OnRefreshCreateRoleTime(HA124_tagMCPlayerInfo _package)

    {