少年修仙传客户端代码仓库
client_Hale
2018-12-29 900b1e420d7ee91cc4683790b714447854b42d7a
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
85 ■■■■ 已修改文件
Lua/LuaConfigUtility.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerRewardModel.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/FightingPKWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/LuaConfigUtility.cs
@@ -4,6 +4,51 @@
public static class ConfigUtil
{
    //这里插入配置表获取方法
    public static CrossServerArenaConfig GetCrossServerArena(string _key)
    {
        return Config.Instance.Get<CrossServerArenaConfig>(_key);
    }
    public static FuncSwitchConfig GetFuncSwitch(string _key)
    {
        return Config.Instance.Get<FuncSwitchConfig>(_key);
    }
    public static GatherSoulConfig GetGatherSoul(string _key)
    {
        return Config.Instance.Get<GatherSoulConfig>(_key);
    }
    public static GatherSoulComposeConfig GetGatherSoulCompose(string _key)
    {
        return Config.Instance.Get<GatherSoulComposeConfig>(_key);
    }
    public static DungeonHelpBattleConfig GetDungeonHelpBattle(string _key)
    {
        return Config.Instance.Get<DungeonHelpBattleConfig>(_key);
    }
    public static GatherSoulPropertyConfig GetGatherSoulProperty(string _key)
    {
        return Config.Instance.Get<GatherSoulPropertyConfig>(_key);
    }
    public static KingTreasureItemConfig GetKingTreasureItem(string _key)
    {
        return Config.Instance.Get<KingTreasureItemConfig>(_key);
    }
    public static KingTreasureConfig GetKingTreasure(string _key)
    {
        return Config.Instance.Get<KingTreasureConfig>(_key);
    }
    public static AncientRobotNameConfig GetAncientRobotName(string _key)
    {
        return Config.Instance.Get<AncientRobotNameConfig>(_key);
    }
    public static ChatBubbleBoxConfig GetChatBubbleBox(string _key)
    {
        return Config.Instance.Get<ChatBubbleBoxConfig>(_key);
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -27,7 +27,7 @@
        [SerializeField] Text lookTimeText;
        [SerializeField] Text curSeasonNumText;
        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
        float coolTime = 0;
        #region Built-in
        protected override void BindController()
        {
@@ -43,6 +43,8 @@
        protected override void OnPreOpen()
        {
            coolTime = 0;
            crossServerModel.isClickCoolTime = false;
            SetDisplay();
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo;
            TimeMgr.Instance.OnMinuteEvent += UpdateMinute;
@@ -53,6 +55,20 @@
        protected override void OnAfterOpen()
        {
            
        }
        protected override void LateUpdate()
        {
            base.LateUpdate();
            if(crossServerModel.isClickCoolTime)
            {
                coolTime += Time.deltaTime;
                if(coolTime >= 1)
                {
                    coolTime = 0;
                    crossServerModel.isClickCoolTime = false;
                }
            }
        }
        protected override void OnPreClose()
@@ -238,6 +254,10 @@
        private void ClickMatch(int type)
        {
            if (crossServerModel.isClickCoolTime) return;
            DebugEx.Log("ClickMatch......");
            crossServerModel.isClickCoolTime = true;
            crossServerModel.SendCrossMatch(type);
            if(type == 0)
            {
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -17,7 +17,7 @@
        public event Action UpdateDayAwardsEvent;
        public const int CrossServerDataMapId = 32010;
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
        public bool isClickCoolTime { get; set; }
        public event Action UpdateMatchStateEvent;
        private bool _isMatching;
        public bool IsMatching {
System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -106,7 +106,7 @@
        bool isbool = IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1);
        if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2)
        {
           ViewCrossPKBillboard(CrossServerOneVsOnePKSeason.Instance.ZoneID, CrossServerOneVsOnePKSeason.Instance.SeasonID);//关于赛季查询
            ViewCrossPKBillboard(CrossServerOneVsOnePKSeason.Instance.ZoneID, CrossServerOneVsOnePKSeason.Instance.SeasonID);//关于赛季查询
        }
    }
@@ -134,7 +134,7 @@
        RedPointSea();
    }
    public  bool IsShowCrossServerOneVsOne()//是否开启跨服按钮
    public bool IsShowCrossServerOneVsOne()//是否开启跨服按钮
    {
        bool Isbool = false;
        if (PlayerDatas.Instance.baseData.LV >= MianOpenLV)
@@ -285,8 +285,7 @@
    public static bool IsCrossServerOneVsOne()//是否再跨服副本中
    {
        int mapId = PlayerDatas.Instance.baseData.MapID;
        return mapId == 32010 || mapId == 32011;
        return PlayerDatas.Instance.baseData.ExAttr5 == 1;
    }
    public void ViewCrossPKBillboard(int ZoneID, int SeasonID)//(赛区,赛季) 查看跨服竞技场赛季排行榜 
@@ -427,13 +426,12 @@
    }
    private static int m_PkType = 0;
    public static int PkType
    {
    public static int PkType {
        get { return m_PkType; }
        set { m_PkType = value; }
    }
    public  static void SetPkType()
    public static void SetPkType()
    {
        if (m_PkType != 1)
        {
@@ -443,7 +441,7 @@
        {
            DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);
        }
    }
}
System/CrossServerOneVsOne/FightingPKWin.cs
@@ -225,7 +225,7 @@
        }
        private void OnRefreshPlayerLifeBar(uint _instanceId, ulong _hp, ulong _maxHp)
        {
            DebugEx.LogError("最大血量"+ _maxHp+"当前血量"+ _hp);
         //   DebugEx.LogError("最大血量"+ _maxHp+"当前血量"+ _hp);
            if (positionType == 1)
            {
                m_RoleInformation2.SetHeroHP((int)_maxHp, (int)_hp);