3335 跨服1V1命名修改

client_Zxw

2019-01-05 37f8dd2e009a14401d33fcae4cbcdbba02c11a3c

3335 跨服1V1命名修改

 Core/NetworkPackage/DTCFile/ServerPack/HC0_CrossRealm/DTCC005_tagGCCrossRealmPKBillboardInfo.cs

@@ -5,8 +5,8 @@
// C0 05 跨服PK赛季排行榜 #tagGCCrossRealmPKBillboardInfo





public class DTCC005_tagGCCrossRealmPKBillboardInfo : DtcBasic

{
    CrossServerRewardModel m_CrossServerRewardModel;

    CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

{
    CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

    CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

    public override void Done(GameNetPackBasic vNetPack)

    {


        base.Done(vNetPack);



 Core/NetworkPackage/DTCFile/ServerPack/HC1_CrossRealm/DTCC102_tagMCCrossRealmPKAwardState.cs

@@ -8,8 +8,8 @@


public class DTCC102_tagMCCrossRealmPKAwardState : DtcBasic {



    CrossServerRewardModel m_CrossServerRewardModel;

    CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

    CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

    CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

    public override void Done(GameNetPackBasic vNetPack) {


        base.Done(vNetPack);


        HC102_tagMCCrossRealmPKAwardState vNetData = vNetPack as HC102_tagMCCrossRealmPKAwardState;
        crossServerRewardModel.CrossRealmPKAwardState(vNetData);


 Lua/Gen/DelegatesGensBridge.cs

@@ -461,7 +461,7 @@
#endif
        }
        
        public CrossServerRewardModel __Gen_Delegate_Imp20(object p0)
        public CrossServerOneVsOneRewardModel __Gen_Delegate_Imp20(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -472,10 +472,10 @@
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                
                PCall(L, 1, 1, errFunc);
                
                
                CrossServerRewardModel __gen_ret = (CrossServerRewardModel)translator.GetObject(L, errFunc + 1, typeof(CrossServerRewardModel));
                PCall(L, 1, 1, errFunc);





                CrossServerOneVsOneRewardModel __gen_ret = (CrossServerOneVsOneRewardModel)translator.GetObject(L, errFunc + 1, typeof(CrossServerOneVsOneRewardModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -14,7 +14,7 @@
    {

        public string PkResultLocalSaveKey { get; private set; }

        public List<CrossServerOneVsOnePkResult> localSaveResults { get; private set; }

        CrossServerRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerRewardModel>(); } }

        CrossServerOneVsOneRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>(); } }

        public event Action UpdateDayAwardsEvent;

        public const int CrossServerDataMapId = 32010;

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

@@ -429,7 +429,7 @@
            CC101_tagCMCrossRealmPKMatch match = new CC101_tagCMCrossRealmPKMatch();

            match.Type = (byte)type;

            GameNetSystem.Instance.SendInfo(match);

            CrossServerRewardModel.PkType = buffDatas.PkType;

            CrossServerOneVsOneRewardModel.PkType = buffDatas.PkType;

        }



        public void SendBuyMatchCount()


 System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs

File was renamed from System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -55,7 +55,7 @@
    DanLVAwardState = 3,

    SeasonAwardState = 4,

}

public class CrossServerRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

public class CrossServerOneVsOneRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

{

    CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

    public Dictionary<int, SeasonAwardClass> SegmentRewardDic = new Dictionary<int, SeasonAwardClass>();//段位奖励


 System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs

@@ -29,8 +29,8 @@
        public static int funcId = 0;

        CrossServerOneVsOnePlayerInfo playerInfo;

        CrossServerWin crossServerWin;

        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        #region Built-in

        protected override void BindController()

        {


 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -104,8 +104,8 @@

        protected override void OnPreClose()
        {
            CrossServerRewardModel.SetPkType();

            Buffmodel.PkType = CrossServerRewardModel.PkType;
            CrossServerOneVsOneRewardModel.SetPkType();

            Buffmodel.PkType = CrossServerOneVsOneRewardModel.PkType;
        }

        protected override void OnAfterClose()
@@ -131,7 +131,7 @@
        #endregion
        private void ExitDungeon()

        {

            CrossServerRewardModel.ExitCrossRealm();

            CrossServerOneVsOneRewardModel.ExitCrossRealm();

            CloseClick();

        }

@@ -196,9 +196,9 @@
                m_SessionObj.SetActive(true);

                m_SessionTxt.text = crossServerModel.pkResultInfo.WinStreak.ToString();

            }

            if (crossServerModel.pkResultInfo.DanLV != CrossServerRewardModel.PkDanLvNow)

            if (crossServerModel.pkResultInfo.DanLV != CrossServerOneVsOneRewardModel.PkDanLvNow)

            {

                var config1 = Config.Instance.Get<CrossServerArenaConfig>(CrossServerRewardModel.PkDanLvNow);

                var config1 = Config.Instance.Get<CrossServerArenaConfig>(CrossServerOneVsOneRewardModel.PkDanLvNow);

                m_SegmentObj.SetActive(true);

                m_SegmentTxt1.text = config1.Name;

                var config2 = Config.Instance.Get<CrossServerArenaConfig>(crossServerModel.pkResultInfo.DanLV);

@@ -243,9 +243,9 @@
            {

                m_SessionObj1.SetActive(false);

            }

            if (crossServerModel.pkResultInfo.DanLV != CrossServerRewardModel.PkDanLvNow)

            if (crossServerModel.pkResultInfo.DanLV != CrossServerOneVsOneRewardModel.PkDanLvNow)

            {

                var config1 = Config.Instance.Get<CrossServerArenaConfig>(CrossServerRewardModel.PkDanLvNow);

                var config1 = Config.Instance.Get<CrossServerArenaConfig>(CrossServerOneVsOneRewardModel.PkDanLvNow);

                m_SegmentObj1.SetActive(true);

                m_Segment_Txt1.text = config1.Name;

                var config2 = Config.Instance.Get<CrossServerArenaConfig>(crossServerModel.pkResultInfo.DanLV);


 System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs

@@ -25,7 +25,7 @@


        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        CrossServerRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerRewardModel>(); } }

        CrossServerOneVsOneRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>(); } }



        CrossServerOneVsOneModel.AwardType awardType;

        float height = 0;


 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -64,7 +64,7 @@
        protected override void OnPreOpen()
        {
            positionType = CrossServerLogin.Instance.oneVsOnePlayerData.myBornPoint;
            CrossServerRewardModel.PkDanLvNow = CrossServerOneVsOnePlayerInfo.Instance.DanLV;

            CrossServerOneVsOneRewardModel.PkDanLvNow = CrossServerOneVsOnePlayerInfo.Instance.DanLV;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)
            GA_Player.s_OnRefreshLife += OnRefreshPlayerLifeBar;
            _MyBuffSortList.Clear();

 System/CrossServerOneVsOne/RankCellCtrl.cs

@@ -23,8 +23,8 @@
        [SerializeField] Text m_SegmentTxt;

        [SerializeField] Text m_IntegralTxt;

        [SerializeField] Image m_RealmImage;

        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        RoleParticularModel roleParticularModel { get { return ModelCenter.Instance.GetModel<RoleParticularModel>(); } }

        public override void Refresh(CellView cell)

        {


 System/CrossServerOneVsOne/RankingWin.cs

@@ -36,8 +36,8 @@
        [SerializeField] ScrollerController m_ScrollerController2;

        [SerializeField] Text m_Text_A;

        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        private int NeedDanLv = 0;
        #region Built-in
        protected override void BindController()

 System/CrossServerOneVsOne/SeasonRewardCell.cs

@@ -24,8 +24,8 @@
        [SerializeField] Text m_Segmenttext;//段位

        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }

        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        public Button ReceiveBtn

        {

            get { return m_ReceiveBtn; }


 System/CrossServerOneVsOne/SeasonRewardWin.cs

@@ -18,8 +18,8 @@
    public class SeasonRewardWin : Window
    {
        [SerializeField] ScrollerController m_ScrollerController;
        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        List<int> SortList = new List<int>();
        #region Built-in
        protected override void BindController()

 System/CrossServerOneVsOne/SegmentRewardCell.cs

@@ -20,8 +20,8 @@
        [SerializeField] GameObject m_IsMissImage;//已错过

        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }

        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        private int _Id = 0;
        public void Start()

        {


 System/CrossServerOneVsOne/SegmentRewardWin.cs

@@ -18,8 +18,8 @@
    public class SegmentRewardWin : Window
    {

        [SerializeField] ScrollerController m_ScrollerController;

        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        List<SeasonAwardClass> ListSort = new List<SeasonAwardClass>();
        #region Built-in
        protected override void BindController()

 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -52,8 +52,8 @@
        OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }

        LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } }

        ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }

        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        public void Init()

        {

            if (LatencyTimeList.Count <= 0)


 System/WindowBase/ModelCenter.cs

@@ -212,7 +212,7 @@
            RegisterModel<MysticalPurchaseModel>();

            RegisterModel<FuncSwitchModel>();

            RegisterModel<CrossServerOneVsOneModel>();

            RegisterModel<CrossServerRewardModel>();

            RegisterModel<CrossServerOneVsOneRewardModel>();

            RegisterModel<GatheringSoulModel>();

            RegisterModel<VirtualPackModel>();

            RegisterModel<GatherSoulComposeModel>();