snxxz_scripts.git

parent: 0622c129 | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2018-10-18 1e07ae89fca05453c0e14125fbef9d00f09d6794

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

4个文件已修改

8个文件已删除

	Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA308_tagMCOnlinePrize.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeWinModel.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/ImpactRankModel.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OnlineRewards.cs	234 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OnlineRewards.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OnlineRewardsModel.cs	372 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OnlineRewardsModel.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OnlineRewardsOnTime.cs	95 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OnlineRewardsOnTime.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OnlineRewardsWin.cs	190 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OnlineRewardsWin.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/WindowBase/ModelCenter.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA308_tagMCOnlinePrize.cs

@@ -6,16 +6,12 @@






public class DTCA308_tagMCOnlinePrize : DtcBasic {
    OnlineRewardsModel m_OnlineRewardsModel;

    OnlineRewardsModel onlineRewardsModel { get { return m_OnlineRewardsModel ?? (m_OnlineRewardsModel = ModelCenter.Instance.GetModel<OnlineRewardsModel>()); } }

public class DTCA308_tagMCOnlinePrize : DtcBasic

{



    public override void Done(GameNetPackBasic vNetPack) {

        base.Done(vNetPack);

        HA308_tagMCOnlinePrize vNetData = vNetPack as HA308_tagMCOnlinePrize;
        if (vNetData == null)

        {

            return;

        }

        onlineRewardsModel.GetMCOnlinePrize(vNetData.OnlineTime, vNetData.PrizeInfo);



    public override void Done(GameNetPackBasic vNetPack)

    {

        base.Done(vNetPack);

        HA308_tagMCOnlinePrize vNetData = vNetPack as HA308_tagMCOnlinePrize;

    }


}



 System/Compose/New/ComposeWinModel.cs

@@ -542,22 +542,15 @@


        if(fixedMat.Count > 0 && unfixedMat.Count  > 0)

        {

            if(isFixedBind && isUnFixedBind)

            if(isFixedBind != isUnFixedBind 
                || (isFixedBind == isUnFixedBind && fixedNoBindRecord != unfixedNoBindRecord))

            {

                return false;

                return true;

            }

            else

            {

                if (isFixedBind || isUnFixedBind)

                {

                    return true;

                }

                else

                {

                    return false;

                }

                return false;

            }

           
        }

        else if(fixedMat.Count > 0)

        {


 System/OpenServerActivity/ImpactRankModel.cs

@@ -42,7 +42,6 @@
                }

            }

            UpdateRedpoint();

            OSCEffectOpen = TimeUtility.OpenDay < ModelCenter.Instance.GetModel<OnlineRewardsModel>().onlineRewardsCloseDay;

        }



        private void OnFuncStateChangeEvent(int _id)


 System/OpenServerActivity/OnlineRewards.cs

File was deleted

 System/OpenServerActivity/OnlineRewards.cs.meta

File was deleted

 System/OpenServerActivity/OnlineRewardsModel.cs

File was deleted

 System/OpenServerActivity/OnlineRewardsModel.cs.meta

File was deleted

 System/OpenServerActivity/OnlineRewardsOnTime.cs

File was deleted

 System/OpenServerActivity/OnlineRewardsOnTime.cs.meta

File was deleted

 System/OpenServerActivity/OnlineRewardsWin.cs

File was deleted

 System/OpenServerActivity/OnlineRewardsWin.cs.meta

File was deleted

 System/WindowBase/ModelCenter.cs

@@ -156,7 +156,6 @@
            RegisterModel<ItemUseModel>();

            RegisterModel<ImpactRankModel>();

            RegisterModel<InSevenDayModel>();

            RegisterModel<OnlineRewardsModel>();

            RegisterModel<LevelGiftModel>();

            RegisterModel<PlayerSuitModel>();

            RegisterModel<CapacityDelayModel>();

			@@ -6,16 +6,12 @@



			public class DTCA308_tagMCOnlinePrize : DtcBasic { OnlineRewardsModel m_OnlineRewardsModel;
			OnlineRewardsModel onlineRewardsModel { get { return m_OnlineRewardsModel ?? (m_OnlineRewardsModel = ModelCenter.Instance.GetModel<OnlineRewardsModel>()); } }
			public class DTCA308_tagMCOnlinePrize : DtcBasic
			{

			public override void Done(GameNetPackBasic vNetPack) {
			base.Done(vNetPack);
			HA308_tagMCOnlinePrize vNetData = vNetPack as HA308_tagMCOnlinePrize; if (vNetData == null)
			{
			return;
			}
			onlineRewardsModel.GetMCOnlinePrize(vNetData.OnlineTime, vNetData.PrizeInfo);

			public override void Done(GameNetPackBasic vNetPack)
			{
			base.Done(vNetPack);
			HA308_tagMCOnlinePrize vNetData = vNetPack as HA308_tagMCOnlinePrize;
			}
			}

			@@ -542,22 +542,15 @@

			if(fixedMat.Count > 0 && unfixedMat.Count > 0)
			{
			if(isFixedBind && isUnFixedBind)
			if(isFixedBind != isUnFixedBind
			\|\| (isFixedBind == isUnFixedBind && fixedNoBindRecord != unfixedNoBindRecord))
			{
			return false;
			return true;
			}
			else
			{
			if (isFixedBind \|\| isUnFixedBind)
			{
			return true;
			}
			else
			{
			return false;
			}
			return false;
			}

			}
			else if(fixedMat.Count > 0)
			{

			@@ -42,7 +42,6 @@
			}
			}
			UpdateRedpoint();
			OSCEffectOpen = TimeUtility.OpenDay < ModelCenter.Instance.GetModel<OnlineRewardsModel>().onlineRewardsCloseDay;
			}

			private void OnFuncStateChangeEvent(int _id)

			@@ -156,7 +156,6 @@
			RegisterModel<ItemUseModel>();
			RegisterModel<ImpactRankModel>();
			RegisterModel<InSevenDayModel>();
			RegisterModel<OnlineRewardsModel>();
			RegisterModel<LevelGiftModel>();
			RegisterModel<PlayerSuitModel>();
			RegisterModel<CapacityDelayModel>();