snxxz_scripts.git

parent: 790349ce | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2018-11-24 106328f95d3e3c7473b01790e40dc16a230660fe

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

8个文件已修改

	Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GA_NpcFightNorm.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/AssistPlayerCell.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonAssistModel.cs	54 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonAssistPlayerWin.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonAssistWin.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/PlayerDead/ReliveWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/EnumHelper.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs

@@ -67,6 +67,7 @@
                    break;

                case E_NpcType.Fight:

                case E_NpcType.FMBoss:

                case E_NpcType.FightAssist:



                    if (_npcConfig.Country == 1)

                    {


 Fight/GameActor/GA_NpcFightNorm.cs

@@ -257,7 +257,8 @@
            && NpcConfig.NPCType != (int)E_NpcType.Func

            && NpcConfig.NPCType != (int)E_NpcType.Collect

            && NpcConfig.NPCType != (int)E_NpcType.Pet

            && !ActorInfo.serverDie;

            && !ActorInfo.serverDie

            && NpcConfig.NPCType != (int)E_NpcType.FightAssist;

    }



    public override bool CanAtkedRotate()


 System/Dungeon/AssistPlayerCell.cs

@@ -13,12 +13,14 @@
        [SerializeField] Image headIcon;

        [SerializeField] Image realmIcon;

        [SerializeField] Button helpBtn;

        [SerializeField] Image helpBgImg;

        [SerializeField] Text helpText;

        [SerializeField] Button goldHelpBtn;

        [SerializeField] Text goldHelpText;

        [SerializeField] Text fightPowerText;

        [SerializeField] Text rewardText;

        [SerializeField] Image relationImg;

        [SerializeField] Text jobNameText;



        FriendsModel friendsModel

        {

@@ -30,7 +32,6 @@


        private void OnEnable()

        {

            helpBtn.AddListener(ClickHelp);

            assistModel.UpdataAssistPlayerEvent += UpdateAssistState;

        }



@@ -54,6 +55,8 @@
            helpBtn.gameObject.SetActive(!playerInfo.IsGoldAssist);

            goldHelpBtn.gameObject.SetActive(playerInfo.IsGoldAssist);

            UpdateAssistState(playerInfo.PlayerID);

            jobNameText.text = OccupationNameConfig.GetOccupationName(playerInfo.Job,1);

            goldHelpText.text = assistModel.goldAssistPlayer.ToString();

            int nirvanaLv = playerInfo.LV - friendsModel.OpenGreatLV;

            lvIcon.gameObject.SetActive(nirvanaLv > 0);

            if (nirvanaLv > 0)

@@ -68,15 +71,19 @@


        public void UpdateAssistState(int playerId)

        {

            helpBtn.RemoveAllListeners();

            if (playerInfo == null || playerInfo.PlayerID != playerId) return;



            if(playerInfo.IsAssist)

            {

                helpText.text = "已召唤";

                helpBgImg.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

            }

            else

            {

                helpBtn.AddListener(ClickHelp);

                helpText.text = "召唤";

                helpBgImg.material = MaterialUtility.GetUIDefaultGraphicMaterial();

            }

        }




 System/Dungeon/DungeonAssistModel.cs

@@ -13,6 +13,10 @@
        public string helpInfoLocalSave { get; private set; }

        public List<string> helpInfolist { get; private set; }

        public event Action UpdateResultEvent;



        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

        FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }



        public override void Init()

        {

            ParseFuncConfig();

@@ -36,6 +40,31 @@
        public override void UnInit()

        {

           

        }



        public bool TryGetFreeRefresh(out int remainNum)

        {

            if (assistRefreshNum < freeRefreshNum)

            {

                remainNum = freeRefreshNum - assistRefreshNum;

            }

            else

            {

                remainNum = (freeRefreshNum + goldRefreshNum) - assistRefreshNum;

            }

            return assistRefreshNum < freeRefreshNum;

        }



        public RelatedToPlayer GetRelatedToPlayer(int playerId)

        {

            bool isFriend =  friendsModel.GetFirendInfo((uint)playerId,(byte)GroupType.Friend) != null;

            bool isAlly = fairyModel.InSameFairy(playerId);



            if (isFriend && isAlly) return RelatedToPlayer.FriendAndAlly;

            if (isFriend) return RelatedToPlayer.Friend;

            if (isAlly) return RelatedToPlayer.Ally;



            return RelatedToPlayer.None;

        }



        #region 本地数据

@@ -229,19 +258,6 @@
        }

        #endregion



        public bool TryGetFreeRefresh(out int remainNum)

        {

            if(assistRefreshNum < freeRefreshNum)

            {

                remainNum = freeRefreshNum - assistRefreshNum;

            }

            else

            {

                remainNum = (freeRefreshNum + goldRefreshNum) - assistRefreshNum;

            }

            return assistRefreshNum < freeRefreshNum;

        }



        public class AssistResult

        {

            public DateTime createTime;

@@ -357,6 +373,8 @@
            public int RealmLV { get; private set; }           // 玩家境界等级

            public int FightPower { get; private set; }           // 玩家战力

            public int IsNeedGold { get; private set; }           // 是否需要仙玉召唤

            public RelatedToPlayer relatedToPlayer { get; private set;} //与玩家的关系



            DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); }}



            public AssistPlayerInfo(HB207_tagMCHelpBattleList.tagMCHelpBattlePlayer battlePlayer)

@@ -372,9 +390,11 @@
                    RealmLV = battlePlayer.RealmLV;

                    FightPower = (int)battlePlayer.FightPower;

                    IsNeedGold = battlePlayer.IsNeedGold;

                    relatedToPlayer = assistModel.GetRelatedToPlayer(PlayerID);

                }

                else

                {

                    relatedToPlayer = RelatedToPlayer.None;

                    int mapId = PlayerDatas.Instance.baseData.MapID;

                    int lineId = PlayerDatas.Instance.baseData.dungeonLineId;

                    var battleConfig = assistModel.GetHelpBattleConfig(mapId,lineId);

@@ -409,5 +429,13 @@
                }

            }

        }



        public enum RelatedToPlayer

        {

            None,//没关系

            Friend, //好友

            Ally, //盟友

            FriendAndAlly, //既是好友又是盟友

        }

    }

}


 System/Dungeon/DungeonAssistPlayerWin.cs

@@ -102,12 +102,12 @@
            goldRefreshBtn.gameObject.SetActive(!isFree);

            if(isFree)

            {

                freeRefreshText.text = StringUtility.Contact("刷新", "(剩余", remainNum, "次)");

                freeRefreshText.text = StringUtility.Contact("剩余", remainNum, "次");

            }

            else

            {

                goldRefreshCostMoneyText.text = assistModel.refreshCostMoney.ToString(); 

                goldRefreshRemianNumText.text = StringUtility.Contact("绑玉刷新", "(剩余", remainNum, "次)");

                goldRefreshRemianNumText.text = StringUtility.Contact("剩余", remainNum, "次");

            }

        }




 System/Dungeon/DungeonAssistWin.cs

@@ -13,6 +13,7 @@
        [SerializeField] Button closeBtn;

        [SerializeField] Button storeBtn;

        [SerializeField] Button registerBtn;

        [SerializeField] Image registerBgImg;



        DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }



@@ -26,12 +27,11 @@
        {

            closeBtn.AddListener(CloseClick);

            storeBtn.AddListener(ClickStore);

            registerBtn.AddListener(ClickAssistRegister);



        }



        protected override void OnPreOpen()

        {

            assistModel.UpdateCheckInResultEvent += UpdateCheckIn;

            assistModel.UpdateResultEvent += UpdateResult;

            SetDisplay();

        }

@@ -44,6 +44,7 @@
        protected override void OnPreClose()

        {

            assistModel.UpdateResultEvent -= UpdateResult;

            assistModel.UpdateCheckInResultEvent -= UpdateCheckIn;

        }



        protected override void OnAfterClose()

@@ -76,8 +77,29 @@
            CreateResultCell();

        }



        private void UpdateCheckIn()

        {

            registerBtn.RemoveAllListeners();

            if(assistModel.IsCheckInOk)

            {



            }

            else

            {

                registerBtn.AddListener(ClickAssistRegister);

            }

        }



        private void ClickAssistRegister()

        {

            if(!assistModel.IsCheckInOk)

            {

                assistModel.SendAssistCheckIn();

            }

            else

            {



            }

          

        }




 System/PlayerDead/ReliveWin.cs

@@ -94,7 +94,7 @@


        protected override void OnPreClose()

        {

           
            StopAllCoroutines();

        }



        protected override void OnAfterClose()


 Utility/EnumHelper.cs

@@ -115,7 +115,8 @@
    TouchKilled = 17,//守护     17

    FMBoss = 18,// 封魔坛boss    18

    BreakableObj = 19,//场景可被攻击物     19

    OpenWorldMap = 20,// 打开世界大地图

    FightAssist = 20,// 助战

    OpenWorldMap = 99,// 打开世界地图

}



public enum E_MovingState

@@ -319,7 +320,7 @@
    PersonalBoss = 25,

    ElderGodArea = 26,

    FairyGrabBoss = 27,

    KillMonster=28,

    KillMonster = 28,

}



public enum ActivityPrepareType

@@ -1111,9 +1112,9 @@
    MarketPutawayPwd = 24,

    DemonJar = 25,

    DemonJarDouble = 28,

    BindJadeWheel=30,

    BindJadeWheel = 30,

    PrayForDrug = 31,

    DemonJarAuto=32,

    DemonJarAuto = 32,

}

			@@ -67,6 +67,7 @@
			break;
			case E_NpcType.Fight:
			case E_NpcType.FMBoss:
			case E_NpcType.FightAssist:

			if (_npcConfig.Country == 1)
			{

			@@ -257,7 +257,8 @@
			&& NpcConfig.NPCType != (int)E_NpcType.Func
			&& NpcConfig.NPCType != (int)E_NpcType.Collect
			&& NpcConfig.NPCType != (int)E_NpcType.Pet
			&& !ActorInfo.serverDie;
			&& !ActorInfo.serverDie
			&& NpcConfig.NPCType != (int)E_NpcType.FightAssist;
			}

			public override bool CanAtkedRotate()

			@@ -13,12 +13,14 @@
			[SerializeField] Image headIcon;
			[SerializeField] Image realmIcon;
			[SerializeField] Button helpBtn;
			[SerializeField] Image helpBgImg;
			[SerializeField] Text helpText;
			[SerializeField] Button goldHelpBtn;
			[SerializeField] Text goldHelpText;
			[SerializeField] Text fightPowerText;
			[SerializeField] Text rewardText;
			[SerializeField] Image relationImg;
			[SerializeField] Text jobNameText;

			FriendsModel friendsModel
			{
			@@ -30,7 +32,6 @@

			private void OnEnable()
			{
			helpBtn.AddListener(ClickHelp);
			assistModel.UpdataAssistPlayerEvent += UpdateAssistState;
			}

			@@ -54,6 +55,8 @@
			helpBtn.gameObject.SetActive(!playerInfo.IsGoldAssist);
			goldHelpBtn.gameObject.SetActive(playerInfo.IsGoldAssist);
			UpdateAssistState(playerInfo.PlayerID);
			jobNameText.text = OccupationNameConfig.GetOccupationName(playerInfo.Job,1);
			goldHelpText.text = assistModel.goldAssistPlayer.ToString();
			int nirvanaLv = playerInfo.LV - friendsModel.OpenGreatLV;
			lvIcon.gameObject.SetActive(nirvanaLv > 0);
			if (nirvanaLv > 0)
			@@ -68,15 +71,19 @@

			public void UpdateAssistState(int playerId)
			{
			helpBtn.RemoveAllListeners();
			if (playerInfo == null \|\| playerInfo.PlayerID != playerId) return;

			if(playerInfo.IsAssist)
			{
			helpText.text = "已召唤";
			helpBgImg.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
			}
			else
			{
			helpBtn.AddListener(ClickHelp);
			helpText.text = "召唤";
			helpBgImg.material = MaterialUtility.GetUIDefaultGraphicMaterial();
			}
			}

			@@ -13,6 +13,10 @@
			public string helpInfoLocalSave { get; private set; }
			public List<string> helpInfolist { get; private set; }
			public event Action UpdateResultEvent;

			FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
			FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }

			public override void Init()
			{
			ParseFuncConfig();
			@@ -36,6 +40,31 @@
			public override void UnInit()
			{

			}

			public bool TryGetFreeRefresh(out int remainNum)
			{
			if (assistRefreshNum < freeRefreshNum)
			{
			remainNum = freeRefreshNum - assistRefreshNum;
			}
			else
			{
			remainNum = (freeRefreshNum + goldRefreshNum) - assistRefreshNum;
			}
			return assistRefreshNum < freeRefreshNum;
			}

			public RelatedToPlayer GetRelatedToPlayer(int playerId)
			{
			bool isFriend = friendsModel.GetFirendInfo((uint)playerId,(byte)GroupType.Friend) != null;
			bool isAlly = fairyModel.InSameFairy(playerId);

			if (isFriend && isAlly) return RelatedToPlayer.FriendAndAlly;
			if (isFriend) return RelatedToPlayer.Friend;
			if (isAlly) return RelatedToPlayer.Ally;

			return RelatedToPlayer.None;
			}

			#region 本地数据
			@@ -229,19 +258,6 @@
			}
			#endregion

			public bool TryGetFreeRefresh(out int remainNum)
			{
			if(assistRefreshNum < freeRefreshNum)
			{
			remainNum = freeRefreshNum - assistRefreshNum;
			}
			else
			{
			remainNum = (freeRefreshNum + goldRefreshNum) - assistRefreshNum;
			}
			return assistRefreshNum < freeRefreshNum;
			}

			public class AssistResult
			{
			public DateTime createTime;
			@@ -357,6 +373,8 @@
			public int RealmLV { get; private set; } // 玩家境界等级
			public int FightPower { get; private set; } // 玩家战力
			public int IsNeedGold { get; private set; } // 是否需要仙玉召唤
			public RelatedToPlayer relatedToPlayer { get; private set;} //与玩家的关系

			DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); }}

			public AssistPlayerInfo(HB207_tagMCHelpBattleList.tagMCHelpBattlePlayer battlePlayer)
			@@ -372,9 +390,11 @@
			RealmLV = battlePlayer.RealmLV;
			FightPower = (int)battlePlayer.FightPower;
			IsNeedGold = battlePlayer.IsNeedGold;
			relatedToPlayer = assistModel.GetRelatedToPlayer(PlayerID);
			}
			else
			{
			relatedToPlayer = RelatedToPlayer.None;
			int mapId = PlayerDatas.Instance.baseData.MapID;
			int lineId = PlayerDatas.Instance.baseData.dungeonLineId;
			var battleConfig = assistModel.GetHelpBattleConfig(mapId,lineId);
			@@ -409,5 +429,13 @@
			}
			}
			}

			public enum RelatedToPlayer
			{
			None,//没关系
			Friend, //好友
			Ally, //盟友
			FriendAndAlly, //既是好友又是盟友
			}
			}
			}

			@@ -102,12 +102,12 @@
			goldRefreshBtn.gameObject.SetActive(!isFree);
			if(isFree)
			{
			freeRefreshText.text = StringUtility.Contact("刷新", "(剩余", remainNum, "次)");
			freeRefreshText.text = StringUtility.Contact("剩余", remainNum, "次");
			}
			else
			{
			goldRefreshCostMoneyText.text = assistModel.refreshCostMoney.ToString();
			goldRefreshRemianNumText.text = StringUtility.Contact("绑玉刷新", "(剩余", remainNum, "次)");
			goldRefreshRemianNumText.text = StringUtility.Contact("剩余", remainNum, "次");
			}
			}

			@@ -13,6 +13,7 @@
			[SerializeField] Button closeBtn;
			[SerializeField] Button storeBtn;
			[SerializeField] Button registerBtn;
			[SerializeField] Image registerBgImg;

			DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }

			@@ -26,12 +27,11 @@
			{
			closeBtn.AddListener(CloseClick);
			storeBtn.AddListener(ClickStore);
			registerBtn.AddListener(ClickAssistRegister);

			}

			protected override void OnPreOpen()
			{
			assistModel.UpdateCheckInResultEvent += UpdateCheckIn;
			assistModel.UpdateResultEvent += UpdateResult;
			SetDisplay();
			}
			@@ -44,6 +44,7 @@
			protected override void OnPreClose()
			{
			assistModel.UpdateResultEvent -= UpdateResult;
			assistModel.UpdateCheckInResultEvent -= UpdateCheckIn;
			}

			protected override void OnAfterClose()
			@@ -76,8 +77,29 @@
			CreateResultCell();
			}

			private void UpdateCheckIn()
			{
			registerBtn.RemoveAllListeners();
			if(assistModel.IsCheckInOk)
			{

			}
			else
			{
			registerBtn.AddListener(ClickAssistRegister);
			}
			}

			private void ClickAssistRegister()
			{
			if(!assistModel.IsCheckInOk)
			{
			assistModel.SendAssistCheckIn();
			}
			else
			{

			}

			}

			@@ -94,7 +94,7 @@

			protected override void OnPreClose()
			{

			StopAllCoroutines();
			}

			protected override void OnAfterClose()

			@@ -115,7 +115,8 @@
			TouchKilled = 17,//守护 17
			FMBoss = 18,// 封魔坛boss 18
			BreakableObj = 19,//场景可被攻击物 19
			OpenWorldMap = 20,// 打开世界大地图
			FightAssist = 20,// 助战
			OpenWorldMap = 99,// 打开世界地图
			}

			public enum E_MovingState
			@@ -319,7 +320,7 @@
			PersonalBoss = 25,
			ElderGodArea = 26,
			FairyGrabBoss = 27,
			KillMonster=28,
			KillMonster = 28,
			}

			public enum ActivityPrepareType
			@@ -1111,9 +1112,9 @@
			MarketPutawayPwd = 24,
			DemonJar = 25,
			DemonJarDouble = 28,
			BindJadeWheel=30,
			BindJadeWheel = 30,
			PrayForDrug = 31,
			DemonJarAuto=32,
			DemonJarAuto = 32,
			}