snxxz_scripts.git

parent: ded3c940 | 补丁 | 提交 | ignore whitespace

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

client_Hale

2019-01-15 d621de6ca8966fc3b7acedbe0808082d9977e1e3

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

8个文件已修改

	Core/GameEngine/SnxxzGame.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/DemonJarAutoChallenge.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Mount/PlayerMountDatas.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/FlashRushToBuyModel.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/FlashSaleItemCell.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Sound/SoundPlayer.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/CameraUtility.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/MaterialUtility.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/SnxxzGame.cs

@@ -163,10 +163,10 @@


    private void OnApplicationQuit()

    {

        if (MaterialUtility.hudMaterial != null)

        if (MaterialUtility.m_HudMaterial != null)

        {

            MaterialUtility.hudMaterial.SetTexture("_Tex1", null);

            MaterialUtility.hudMaterial.SetTexture("_Tex2", null);

            MaterialUtility.m_HudMaterial.SetTexture("_Tex1", null);

            MaterialUtility.m_HudMaterial.SetTexture("_Tex2", null);

        }



        GameNetSystem.Instance.Disconnect();


 System/FindPrecious/DemonJarAutoChallenge.cs

@@ -10,6 +10,7 @@
    DemonJarModel model { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
    FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
    DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
    CrossServerOneVsOneModel crossServerOneVsOneModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>();  } }

    float timer = 0f;
    float lastTouchTime = 0f;
@@ -59,6 +60,11 @@

        timer = 0f;

        if (crossServerOneVsOneModel.IsMatching)
        {
            return;
        }

        if (CrossServerLogin.Instance.IsEnterCrossServerPreparing())
        {
            return;

 System/Mount/PlayerMountDatas.cs

@@ -224,7 +224,7 @@
            }

        }

    }

    private const int Redpoint_key1 = 1010301;

    private const int Redpoint_key1 = 1050101;

    public Redpoint redPointStre1 = new Redpoint(MainRedDot.RedPoint_MountPackKey, Redpoint_key1);//坐骑外观

    private const int Redpoint_key2 = 1050102;

    public Redpoint redPointStre2 = new Redpoint(MainRedDot.RedPoint_MountPackKey, Redpoint_key2);//坐骑兽魂


 System/OpenServerActivity/FlashRushToBuyModel.cs

@@ -163,7 +163,9 @@
            for (int i = 0; i < appointmentInfo.GoodsCount; i++)

            {

                var saleItemInfo = appointmentInfo.GoodsList[i];

                if (appointmentInfo.GoodsCount < 2 && saleItemInfo.State == 1)

                if (appointmentInfo.GoodsCount < 2 
                    && saleItemInfo.State == 1

                    && appointmentInfo.IsAll != 1)

                {

                    SysNotifyMgr.Instance.ShowTip("FlashRushToBuy1");

                }


 System/OpenServerActivity/FlashSaleItemCell.cs

@@ -189,8 +189,8 @@
            int fullSeverRemain = 0;

            int personalRemain = 0;

            int sellState = GetSellSate(out fullSeverRemain,out personalRemain);

            string fullSeverRemainStr = fullSeverRemain > 0 ? fullSeverRemain.ToString() : UIHelper.AppendStringColor(TextColType.Red, fullSeverRemain.ToString());

            string personalRemainStr = personalRemain > 0 ? personalRemain.ToString() : UIHelper.AppendStringColor(TextColType.Red, personalRemain.ToString());

            string fullSeverRemainStr = fullSeverRemain > 0 ? UIHelper.AppendStringColor(TextColType.Green, fullSeverRemain.ToString(),true) : UIHelper.AppendStringColor(TextColType.Red, fullSeverRemain.ToString());

            string personalRemainStr = personalRemain > 0 ? UIHelper.AppendStringColor(TextColType.Green, personalRemain.ToString(),true) : UIHelper.AppendStringColor(TextColType.Red, personalRemain.ToString());

            fullServerRemainNum.text = fullSeverRemainStr;

            personalRemainNum.text = personalRemainStr;

            switch (sellState)


 System/Sound/SoundPlayer.cs

@@ -197,6 +197,11 @@
            return;

        }



        if (_source)
        {
            return;
        }



        AudioClip clip = null;

        if (!commonUseAudioClipDict.TryGetValue(_audioId, out clip))

        {


 Utility/CameraUtility.cs

@@ -95,7 +95,7 @@
        {

            if (Mathf.Abs(_texture.width - ResolutionUtility.currentResolution.x) > 10 || Mathf.Abs(_texture.height - ResolutionUtility.currentResolution.y) > 10)

            {

                Resources.UnloadAsset(_texture);

                //Resources.UnloadAsset(_texture);

            }

            else

            {


 Utility/MaterialUtility.cs

@@ -71,7 +71,7 @@
    }


    static Material m_HudMaterial;
    public static Material m_HudMaterial;
    public static Material hudMaterial {
        get {
            if (m_HudMaterial == null)

			@@ -163,10 +163,10 @@

			private void OnApplicationQuit()
			{
			if (MaterialUtility.hudMaterial != null)
			if (MaterialUtility.m_HudMaterial != null)
			{
			MaterialUtility.hudMaterial.SetTexture("_Tex1", null);
			MaterialUtility.hudMaterial.SetTexture("_Tex2", null);
			MaterialUtility.m_HudMaterial.SetTexture("_Tex1", null);
			MaterialUtility.m_HudMaterial.SetTexture("_Tex2", null);
			}

			GameNetSystem.Instance.Disconnect();

			@@ -10,6 +10,7 @@
			DemonJarModel model { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
			FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
			DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
			CrossServerOneVsOneModel crossServerOneVsOneModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

			float timer = 0f;
			float lastTouchTime = 0f;
			@@ -59,6 +60,11 @@

			timer = 0f;

			if (crossServerOneVsOneModel.IsMatching)
			{
			return;
			}

			if (CrossServerLogin.Instance.IsEnterCrossServerPreparing())
			{
			return;

			@@ -224,7 +224,7 @@
			}
			}
			}
			private const int Redpoint_key1 = 1010301;
			private const int Redpoint_key1 = 1050101;
			public Redpoint redPointStre1 = new Redpoint(MainRedDot.RedPoint_MountPackKey, Redpoint_key1);//坐骑外观
			private const int Redpoint_key2 = 1050102;
			public Redpoint redPointStre2 = new Redpoint(MainRedDot.RedPoint_MountPackKey, Redpoint_key2);//坐骑兽魂

			@@ -163,7 +163,9 @@
			for (int i = 0; i < appointmentInfo.GoodsCount; i++)
			{
			var saleItemInfo = appointmentInfo.GoodsList[i];
			if (appointmentInfo.GoodsCount < 2 && saleItemInfo.State == 1)
			if (appointmentInfo.GoodsCount < 2
			&& saleItemInfo.State == 1
			&& appointmentInfo.IsAll != 1)
			{
			SysNotifyMgr.Instance.ShowTip("FlashRushToBuy1");
			}

			@@ -189,8 +189,8 @@
			int fullSeverRemain = 0;
			int personalRemain = 0;
			int sellState = GetSellSate(out fullSeverRemain,out personalRemain);
			string fullSeverRemainStr = fullSeverRemain > 0 ? fullSeverRemain.ToString() : UIHelper.AppendStringColor(TextColType.Red, fullSeverRemain.ToString());
			string personalRemainStr = personalRemain > 0 ? personalRemain.ToString() : UIHelper.AppendStringColor(TextColType.Red, personalRemain.ToString());
			string fullSeverRemainStr = fullSeverRemain > 0 ? UIHelper.AppendStringColor(TextColType.Green, fullSeverRemain.ToString(),true) : UIHelper.AppendStringColor(TextColType.Red, fullSeverRemain.ToString());
			string personalRemainStr = personalRemain > 0 ? UIHelper.AppendStringColor(TextColType.Green, personalRemain.ToString(),true) : UIHelper.AppendStringColor(TextColType.Red, personalRemain.ToString());
			fullServerRemainNum.text = fullSeverRemainStr;
			personalRemainNum.text = personalRemainStr;
			switch (sellState)

			@@ -197,6 +197,11 @@
			return;
			}

			if (_source)
			{
			return;
			}

			AudioClip clip = null;
			if (!commonUseAudioClipDict.TryGetValue(_audioId, out clip))
			{

			@@ -95,7 +95,7 @@
			{
			if (Mathf.Abs(_texture.width - ResolutionUtility.currentResolution.x) > 10 \|\| Mathf.Abs(_texture.height - ResolutionUtility.currentResolution.y) > 10)
			{
			Resources.UnloadAsset(_texture);
			//Resources.UnloadAsset(_texture);
			}
			else
			{

			@@ -71,7 +71,7 @@
			}


			static Material m_HudMaterial;
			public static Material m_HudMaterial;
			public static Material hudMaterial {
			get {
			if (m_HudMaterial == null)