snxxz_scripts.git

parent: 4927950f | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2018-08-13 88fc0bd7f737aa9602de0d892a80de3e33d3834a

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

3个文件已修改

5个文件已删除

	Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/SystemSetting/ActivitiesPushMgr.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/SystemSetting/SystemSetting.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/PostProcessingIniter.cs	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/PostProcessingIniter.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/PostProcessingUtility.cs	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/PostProcessingUtility.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta

File was deleted

 System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs

@@ -171,7 +171,7 @@
            }



            m_Selected.gameObject.SetActive(selected);

            m_BackGround.SetSprite(selected ? "DemonJarSelectFrame" : "DemonJarNormalFrame");

            //m_BackGround.SetSprite(selected ? "DemonJarSelectFrame" : "DemonJarNormalFrame");



            var fontPattern = string.Empty;

            switch (_state)


 System/SystemSetting/ActivitiesPushMgr.cs

@@ -84,7 +84,7 @@
                    {

                        PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]);

                        string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType);

                        SendPushInfo(GetPushJsonData(rankStartId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate107", rankName)));

                        SendPushInfo(GetPushJsonData(rankStartId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate107",Language.Get(rankName))));

                    }

                }

            }

@@ -109,7 +109,7 @@
                    {

                        PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]);

                        string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType);

                        SendPushInfo(GetPushJsonData(rankEndId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate108", rankName)));

                        SendPushInfo(GetPushJsonData(rankEndId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate108", Language.Get(rankName))));

                    }

                }

            }


 System/SystemSetting/SystemSetting.cs

@@ -131,21 +131,18 @@
                Shader.DisableKeyword("QUALITY_HGH");

                Shader.DisableKeyword("QUALITY_MED");

                Shader.EnableKeyword("QUALITY_LOW");

                PostProcessingUtility.TogglePostProcessing(false);

                break;

            case GameQuality.Medium:

                Shader.globalMaximumLOD = 250;

                Shader.DisableKeyword("QUALITY_HGH");

                Shader.EnableKeyword("QUALITY_MED");

                Shader.DisableKeyword("QUALITY_LOW");

                PostProcessingUtility.TogglePostProcessing(false);

                break;

            case GameQuality.High:

                Shader.globalMaximumLOD = 500;

                Shader.EnableKeyword("QUALITY_HGH");

                Shader.DisableKeyword("QUALITY_MED");

                Shader.DisableKeyword("QUALITY_LOW");

                PostProcessingUtility.TogglePostProcessing(false);

                break;

        }




 Utility/PostProcessingIniter.cs

File was deleted

 Utility/PostProcessingIniter.cs.meta

File was deleted

 Utility/PostProcessingUtility.cs

File was deleted

 Utility/PostProcessingUtility.cs.meta

File was deleted

			@@ -171,7 +171,7 @@
			}

			m_Selected.gameObject.SetActive(selected);
			m_BackGround.SetSprite(selected ? "DemonJarSelectFrame" : "DemonJarNormalFrame");
			//m_BackGround.SetSprite(selected ? "DemonJarSelectFrame" : "DemonJarNormalFrame");

			var fontPattern = string.Empty;
			switch (_state)

			@@ -84,7 +84,7 @@
			{
			PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]);
			string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType);
			SendPushInfo(GetPushJsonData(rankStartId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate107", rankName)));
			SendPushInfo(GetPushJsonData(rankStartId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate107",Language.Get(rankName))));
			}
			}
			}
			@@ -109,7 +109,7 @@
			{
			PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]);
			string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType);
			SendPushInfo(GetPushJsonData(rankEndId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate108", rankName)));
			SendPushInfo(GetPushJsonData(rankEndId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate108", Language.Get(rankName))));
			}
			}
			}

			@@ -131,21 +131,18 @@
			Shader.DisableKeyword("QUALITY_HGH");
			Shader.DisableKeyword("QUALITY_MED");
			Shader.EnableKeyword("QUALITY_LOW");
			PostProcessingUtility.TogglePostProcessing(false);
			break;
			case GameQuality.Medium:
			Shader.globalMaximumLOD = 250;
			Shader.DisableKeyword("QUALITY_HGH");
			Shader.EnableKeyword("QUALITY_MED");
			Shader.DisableKeyword("QUALITY_LOW");
			PostProcessingUtility.TogglePostProcessing(false);
			break;
			case GameQuality.High:
			Shader.globalMaximumLOD = 500;
			Shader.EnableKeyword("QUALITY_HGH");
			Shader.DisableKeyword("QUALITY_MED");
			Shader.DisableKeyword("QUALITY_LOW");
			PostProcessingUtility.TogglePostProcessing(false);
			break;
			}