snxxz_scripts.git

parent: 1fe0e04d | 补丁 | 提交 | show whitespace

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

client_linchunjie

2018-09-19 0501f99c58363fa437eeba57789d9dff574bde31

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

4个文件已修改

	System/Compose/New/ComposeWin.cs	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemModel.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Team/TeamInviteEntrancePanel.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/EnumHelper.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Compose/New/ComposeWin.cs

@@ -67,6 +67,35 @@
        protected override void OnPreOpen()

        {

            ComposeModel.ResetModel();

            if(WindowJumpMgr.Instance.IsJumpState)

            {

                if(ComposeModel.CurComposeModel != null)

                {

                    ComposeModel.SetJumpToModel((ComposeFuncType)ComposeModel.CurComposeModel.firstType,

                        ComposeModel.CurComposeModel.secondType, ComposeModel.CurComposeModel.thirdType);

                    switch ((ComposeFuncType)ComposeModel.CurComposeModel.firstType)

                    {

                        case ComposeFuncType.Wings:

                            functionOrder = _wingsUITitleType.order;

                            break;

                        case ComposeFuncType.Ticket:

                            functionOrder = _ticketUITitleType.order;

                            break;

                        case ComposeFuncType.Fairy:

                            functionOrder = _godequipUITitleType.order;

                            break;

                        case ComposeFuncType.Equip:

                            functionOrder = _equipUITitleType.order;

                            break;

                        case ComposeFuncType.Item:

                            functionOrder = _itemUITitleType.order;

                            break;

                        case ComposeFuncType.MountDogz:

                            functionOrder = _dogzEquipFunc.order;

                            break;

                    }

                }

            }

        }



        protected override void OnActived()


 System/KnapSack/Logic/ItemModel.cs

@@ -56,15 +56,14 @@


            useDataDict = ConfigParse.Analysis(info.UserData);

            this.equipScore = modelInterface.SetEquipScore(packType,itemInfo.ItemID,useDataDict);

            DebugEx.Log("Pack:" + packType + "ID：" + info.ItemID + "GUID:" + info.ItemGUID);

            if(GetUseDataModel((int)ItemUseDataKey.Def_IudetItemCount) != null)

            {

                itemInfo.ItemCount = GetUseDataModel((int)ItemUseDataKey.Def_IudetItemCount)[0];

            }

            List<int> itemEffectTime = GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

            if(itemEffectTime != null && itemEffectTime[0] != 0 && chinItemModel.ExpireTime > 0)

            {

                DebugEx.Log("创建时间：" + itemEffectTime[0]);

                //System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区

                //DateTime dt = startTime.AddSeconds(itemEffectTime[0]);

                //DesignDebug.Log("创建DataTime:" + dt);



                switch ((EquipReduceType)chinItemModel.EndureReduceType)

                {

                    case EquipReduceType.Def_EquipReduceType_None:


 System/Team/TeamInviteEntrancePanel.cs

@@ -23,20 +23,20 @@


        private void OpenFriend()

        {

            WindowCenter.Instance.Open<TeamInviteWin>();

            model.InvitePlayers(TeamInviteType.Friend);

            WindowCenter.Instance.Open<TeamInviteWin>();

        }



        private void OpenFairy()

        {

            WindowCenter.Instance.Open<TeamInviteWin>();

            model.InvitePlayers(TeamInviteType.Fairy);

            WindowCenter.Instance.Open<TeamInviteWin>();

        }



        private void OpenNearby()

        {

            WindowCenter.Instance.Open<TeamInviteWin>();

            model.InvitePlayers(TeamInviteType.NearBy);

            WindowCenter.Instance.Open<TeamInviteWin>();

        }



        private void Awake()


 Utility/EnumHelper.cs

@@ -1452,10 +1452,10 @@
{

    Def_IudetMapLoaction = 15,  // 物品记录地图坐标[mapid, posx, posy]

    Def_IudetLegendAttrID = 17,  //物品传奇属性ID列表

    Def_IudetItemCount = 18,  // 物品个数，支持20亿，目前仅特殊转化物品会用到

    Def_IudetLegendAttrValue = 19,  //物品传奇属性值列表

    Def_IudetOutOfPrintAttrID = 21,  //物品绝版属性ID列表

    Def_IudetOutOfPrintAttrValue = 23,  //物品绝版属性值列表





    Def_IudetItemColor = 16,  //物品颜色，如果该值没有就取物品

    Def_IudetCancelUseLimit = 20,  //物品取消使用限制

			@@ -67,6 +67,35 @@
			protected override void OnPreOpen()
			{
			ComposeModel.ResetModel();
			if(WindowJumpMgr.Instance.IsJumpState)
			{
			if(ComposeModel.CurComposeModel != null)
			{
			ComposeModel.SetJumpToModel((ComposeFuncType)ComposeModel.CurComposeModel.firstType,
			ComposeModel.CurComposeModel.secondType, ComposeModel.CurComposeModel.thirdType);
			switch ((ComposeFuncType)ComposeModel.CurComposeModel.firstType)
			{
			case ComposeFuncType.Wings:
			functionOrder = _wingsUITitleType.order;
			break;
			case ComposeFuncType.Ticket:
			functionOrder = _ticketUITitleType.order;
			break;
			case ComposeFuncType.Fairy:
			functionOrder = _godequipUITitleType.order;
			break;
			case ComposeFuncType.Equip:
			functionOrder = _equipUITitleType.order;
			break;
			case ComposeFuncType.Item:
			functionOrder = _itemUITitleType.order;
			break;
			case ComposeFuncType.MountDogz:
			functionOrder = _dogzEquipFunc.order;
			break;
			}
			}
			}
			}

			protected override void OnActived()

			@@ -56,15 +56,14 @@

			useDataDict = ConfigParse.Analysis(info.UserData);
			this.equipScore = modelInterface.SetEquipScore(packType,itemInfo.ItemID,useDataDict);
			DebugEx.Log("Pack:" + packType + "ID：" + info.ItemID + "GUID:" + info.ItemGUID);
			if(GetUseDataModel((int)ItemUseDataKey.Def_IudetItemCount) != null)
			{
			itemInfo.ItemCount = GetUseDataModel((int)ItemUseDataKey.Def_IudetItemCount)[0];
			}
			List<int> itemEffectTime = GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			if(itemEffectTime != null && itemEffectTime[0] != 0 && chinItemModel.ExpireTime > 0)
			{
			DebugEx.Log("创建时间：" + itemEffectTime[0]);
			//System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
			//DateTime dt = startTime.AddSeconds(itemEffectTime[0]);
			//DesignDebug.Log("创建DataTime:" + dt);

			switch ((EquipReduceType)chinItemModel.EndureReduceType)
			{
			case EquipReduceType.Def_EquipReduceType_None:

			@@ -23,20 +23,20 @@

			private void OpenFriend()
			{
			WindowCenter.Instance.Open<TeamInviteWin>();
			model.InvitePlayers(TeamInviteType.Friend);
			WindowCenter.Instance.Open<TeamInviteWin>();
			}

			private void OpenFairy()
			{
			WindowCenter.Instance.Open<TeamInviteWin>();
			model.InvitePlayers(TeamInviteType.Fairy);
			WindowCenter.Instance.Open<TeamInviteWin>();
			}

			private void OpenNearby()
			{
			WindowCenter.Instance.Open<TeamInviteWin>();
			model.InvitePlayers(TeamInviteType.NearBy);
			WindowCenter.Instance.Open<TeamInviteWin>();
			}

			private void Awake()

			@@ -1452,10 +1452,10 @@
			{
			Def_IudetMapLoaction = 15, // 物品记录地图坐标[mapid, posx, posy]
			Def_IudetLegendAttrID = 17, //物品传奇属性ID列表
			Def_IudetItemCount = 18, // 物品个数，支持20亿，目前仅特殊转化物品会用到
			Def_IudetLegendAttrValue = 19, //物品传奇属性值列表
			Def_IudetOutOfPrintAttrID = 21, //物品绝版属性ID列表
			Def_IudetOutOfPrintAttrValue = 23, //物品绝版属性值列表


			Def_IudetItemColor = 16, //物品颜色，如果该值没有就取物品
			Def_IudetCancelUseLimit = 20, //物品取消使用限制