From 88fc0bd7f737aa9602de0d892a80de3e33d3834a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 13 八月 2018 10:56:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
/dev/null | 12 ------------
System/SystemSetting/ActivitiesPushMgr.cs | 4 ++--
System/SystemSetting/SystemSetting.cs | 3 ---
System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs | 2 +-
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta b/Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta
deleted file mode 100644
index ee95432..0000000
--- a/Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: d4bbed9a14bff5e48b2bdd4df9dd3485
-folderAsset: yes
-timeCreated: 1501209136
-licenseType: Free
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs b/System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs
index c526d11..e52f9fe 100644
--- a/System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs
+++ b/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)
diff --git a/System/SystemSetting/ActivitiesPushMgr.cs b/System/SystemSetting/ActivitiesPushMgr.cs
index 6666e92..cc63db6 100644
--- a/System/SystemSetting/ActivitiesPushMgr.cs
+++ b/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))));
}
}
}
diff --git a/System/SystemSetting/SystemSetting.cs b/System/SystemSetting/SystemSetting.cs
index f548a1b..e2636d5 100644
--- a/System/SystemSetting/SystemSetting.cs
+++ b/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;
}
diff --git a/Utility/PostProcessingIniter.cs b/Utility/PostProcessingIniter.cs
deleted file mode 100644
index ad46489..0000000
--- a/Utility/PostProcessingIniter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.PostProcessing;
-
-public class PostProcessingIniter : PostProcessingBehaviour
-{
-
- [SerializeField] PPType m_PostProcessType = PPType.Scene;
-
- private void Awake()
- {
- if (profile != null)
- {
- PostProcessingUtility.RegisterPostProcessing(m_PostProcessType, this);
- }
- }
-
-}
-
-public enum PPType
-{
- Scene,
- UI,
- TreasureList,
- TreasureDetails,
-}
diff --git a/Utility/PostProcessingIniter.cs.meta b/Utility/PostProcessingIniter.cs.meta
deleted file mode 100644
index 07e41cd..0000000
--- a/Utility/PostProcessingIniter.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 6a079beb402f230439e9455fead14619
-timeCreated: 1527824982
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Utility/PostProcessingUtility.cs b/Utility/PostProcessingUtility.cs
deleted file mode 100644
index 02fa9c9..0000000
--- a/Utility/PostProcessingUtility.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.PostProcessing;
-
-public class PostProcessingUtility
-{
- static Dictionary<PPType, PostProcessingBehaviour> postProcessingBehaviours = new Dictionary<PPType, PostProcessingBehaviour>();
-
- public static void RegisterPostProcessing(PPType _type, PostProcessingBehaviour _behaviour)
- {
- postProcessingBehaviours[_type] = _behaviour;
- }
-
- public static void TogglePostProcessing(bool _enable)
- {
- foreach (var behaviour in postProcessingBehaviours.Values)
- {
- behaviour.enabled = _enable;
- }
- }
-
- public static void SetSceneBloomIntensity(float _intensity)
- {
- if (postProcessingBehaviours.ContainsKey(PPType.Scene))
- {
- var behaviour = postProcessingBehaviours[PPType.Scene];
- if (behaviour != null && behaviour.profile != null)
- {
- if (_intensity > 0.1f)
- {
- behaviour.profile.bloom.enabled = true;
-
- var settings = behaviour.profile.bloom.settings;
- var bloomSettings = settings.bloom;
- bloomSettings.intensity = _intensity;
- settings.bloom = bloomSettings;
-
- behaviour.profile.bloom.settings = settings;
- }
- else
- {
- behaviour.profile.bloom.enabled = false;
- }
-
- }
-
- }
-
- }
-
-}
diff --git a/Utility/PostProcessingUtility.cs.meta b/Utility/PostProcessingUtility.cs.meta
deleted file mode 100644
index e1b3ca3..0000000
--- a/Utility/PostProcessingUtility.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 0917d0a6492151f4387e5ebf2d690004
-timeCreated: 1527818719
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
--
Gitblit v1.8.0