Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -990,6 +990,9 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetLuckyBoxFreeTimes()
         {
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false))
+                return false;
+
             long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(LuckyBoxDataManager.BOX_ID_2);
             if (freeTime > 0)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Button19.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_Button19
+    {
+        public GButton target;
+        public Controller m_ColorType;
+        public const string URL = "ui://374k3dwvxvs39fyn";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "Button19";
+        private static UI_Button19 _proxy;
+
+        public static UI_Button19 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button19();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button19 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button19();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_ColorType = comp.GetController("ColorType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ColorType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Button19.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a3762c153e036414ea963437d8ec14a6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Button20.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_Button20
+    {
+        public GButton target;
+        public Controller m_ColorType;
+        public const string URL = "ui://374k3dwvxvs39fyq";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "Button20";
+        private static UI_Button20 _proxy;
+
+        public static UI_Button20 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button20();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button20 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button20();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_ColorType = comp.GetController("ColorType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ColorType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Button20.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e3d944be9e8c4034a8eafbd91892f85b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Button6.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_Button6
+    {
+        public GButton target;
+        public GTextField m_title1;
+        public const string URL = "ui://374k3dwvxvs39fyf";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "Button6";
+        private static UI_Button6 _proxy;
+
+        public static UI_Button6 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button6();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button6 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button6();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_title1 = (GTextField)comp.GetChild("title1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_title1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Button6.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6c020ad45bb564540a1d0d5b46ac73fc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeNameUI.cs

@@ -7,6 +7,7 @@ namespace UI.RoleInfo
     public partial class UI_ChangeNameUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GImage m_bg;
         public GGraph m_holderLeftTop;
         public GGraph m_holderRightDowm;
@@ -63,6 +64,7 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_bg = (GImage)comp.GetChild("bg");
             m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
             m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
@@ -75,6 +77,7 @@ namespace UI.RoleInfo
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_bg = null;
             m_holderLeftTop = null;
             m_holderRightDowm = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI.cs

@@ -7,18 +7,25 @@ namespace UI.RoleInfo
     public partial class UI_SettingUI
     {
         public GComponent target;
-        public GImage m_bg;
-        public GGraph m_holderLeftTop;
-        public GGraph m_holderRightDowm;
-        public GButton m_btnLogout;
+        public Controller m_c1;
+        public GLoader m_loaBg;
+        public GButton m_btnChooseMainBg;
+        public GLoader m_icon;
+        public GList m_settingTypeList;
         public GButton m_btnExit;
-        public GSlider m_musicSlider;
+        public UI_Slider2 m_musicSlider;
         public GButton m_btnMusic;
+        public UI_Slider2 m_soundSlider;
         public GButton m_btnSound;
-        public GSlider m_soundSlider;
-        public GSlider m_voiceSlider;
+        public UI_Slider2 m_voiceSlider;
         public GButton m_btnVoice;
-        public GButton m_btnChooseMainBg;
+        public GTextField m_gameProtectAgree;
+        public GTextField m_privacyAgree;
+        public GTextField m_childrenAgree;
+        public GButton m_btnBinding;
+        public UI_Button19 m_btnLogout;
+        public UI_Button20 m_btnGiftCode;
+        public GButton m_btnBinding_2;
         public Transition m_t0;
         public const string URL = "ui://374k3dwvr9ri1";
         public const string PACKAGE_NAME = "RoleInfo";
@@ -67,34 +74,53 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
-            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
-            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
-            m_btnLogout = (GButton)comp.GetChild("btnLogout");
+            m_c1 = comp.GetController("c1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnChooseMainBg = (GButton)comp.GetChild("btnChooseMainBg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_settingTypeList = (GList)comp.GetChild("settingTypeList");
             m_btnExit = (GButton)comp.GetChild("btnExit");
-            m_musicSlider = (GSlider)comp.GetChild("musicSlider");
+            m_musicSlider = (UI_Slider2)UI_Slider2.Create(comp.GetChild("musicSlider"));
             m_btnMusic = (GButton)comp.GetChild("btnMusic");
+            m_soundSlider = (UI_Slider2)UI_Slider2.Create(comp.GetChild("soundSlider"));
             m_btnSound = (GButton)comp.GetChild("btnSound");
-            m_soundSlider = (GSlider)comp.GetChild("soundSlider");
-            m_voiceSlider = (GSlider)comp.GetChild("voiceSlider");
+            m_voiceSlider = (UI_Slider2)UI_Slider2.Create(comp.GetChild("voiceSlider"));
             m_btnVoice = (GButton)comp.GetChild("btnVoice");
-            m_btnChooseMainBg = (GButton)comp.GetChild("btnChooseMainBg");
+            m_gameProtectAgree = (GTextField)comp.GetChild("gameProtectAgree");
+            m_privacyAgree = (GTextField)comp.GetChild("privacyAgree");
+            m_childrenAgree = (GTextField)comp.GetChild("childrenAgree");
+            m_btnBinding = (GButton)comp.GetChild("btnBinding");
+            m_btnLogout = (UI_Button19)UI_Button19.Create(comp.GetChild("btnLogout"));
+            m_btnGiftCode = (UI_Button20)UI_Button20.Create(comp.GetChild("btnGiftCode"));
+            m_btnBinding_2 = (GButton)comp.GetChild("btnBinding");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
-            m_holderLeftTop = null;
-            m_holderRightDowm = null;
-            m_btnLogout = null;
+            m_c1 = null;
+            m_loaBg = null;
+            m_btnChooseMainBg = null;
+            m_icon = null;
+            m_settingTypeList = null;
             m_btnExit = null;
+            m_musicSlider.Dispose();
             m_musicSlider = null;
             m_btnMusic = null;
-            m_btnSound = null;
+            m_soundSlider.Dispose();
             m_soundSlider = null;
+            m_btnSound = null;
+            m_voiceSlider.Dispose();
             m_voiceSlider = null;
             m_btnVoice = null;
-            m_btnChooseMainBg = null;
+            m_gameProtectAgree = null;
+            m_privacyAgree = null;
+            m_childrenAgree = null;
+            m_btnBinding = null;
+            m_btnLogout.Dispose();
+            m_btnLogout = null;
+            m_btnGiftCode.Dispose();
+            m_btnGiftCode = null;
+            m_btnBinding_2 = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI_old2.cs

@@ -0,0 +1,107 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_SettingUI_old2
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public GButton m_btnLogout;
+        public GButton m_btnExit;
+        public GComponent m_musicSlider;
+        public GButton m_btnMusic;
+        public GButton m_btnSound;
+        public GComponent m_soundSlider;
+        public GComponent m_voiceSlider;
+        public GButton m_btnVoice;
+        public GButton m_btnChooseMainBg;
+        public Transition m_t0;
+        public const string URL = "ui://374k3dwvxvs39fyb";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "SettingUI_old2";
+        private static UI_SettingUI_old2 _proxy;
+
+        public static UI_SettingUI_old2 Create(GObject gObject = null)
+        {
+            var ui = new UI_SettingUI_old2();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_SettingUI_old2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SettingUI_old2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GImage)comp.GetChild("bg");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_btnLogout = (GButton)comp.GetChild("btnLogout");
+            m_btnExit = (GButton)comp.GetChild("btnExit");
+            m_musicSlider = (GComponent)comp.GetChild("musicSlider");
+            m_btnMusic = (GButton)comp.GetChild("btnMusic");
+            m_btnSound = (GButton)comp.GetChild("btnSound");
+            m_soundSlider = (GComponent)comp.GetChild("soundSlider");
+            m_voiceSlider = (GComponent)comp.GetChild("voiceSlider");
+            m_btnVoice = (GButton)comp.GetChild("btnVoice");
+            m_btnChooseMainBg = (GButton)comp.GetChild("btnChooseMainBg");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_btnLogout = null;
+            m_btnExit = null;
+            m_musicSlider = null;
+            m_btnMusic = null;
+            m_btnSound = null;
+            m_soundSlider = null;
+            m_voiceSlider = null;
+            m_btnVoice = null;
+            m_btnChooseMainBg = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI_old2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 96512d990b8f7044fba064f6c5679134
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Slider2.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_Slider2
+    {
+        public GSlider target;
+        public Controller m_c1;
+        public GImage m_progressBar;
+        public const string URL = "ui://374k3dwvox1y9fz9";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "Slider2";
+        private static UI_Slider2 _proxy;
+
+        public static UI_Slider2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Slider2();
+            if(gObject == null)
+            	ui.target =  (GSlider)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GSlider)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Slider2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Slider2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GSlider)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GSlider)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_progressBar = (GImage)comp.GetChild("progressBar");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_progressBar = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Slider2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8a3de111efa431b44ab27288384828d9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Slider2_grip.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_Slider2_grip
+    {
+        public GButton target;
+        public GImage m_enable;
+        public GImage m_disable;
+        public const string URL = "ui://374k3dwvox1y9fz8";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "Slider2_grip";
+        private static UI_Slider2_grip _proxy;
+
+        public static UI_Slider2_grip Create(GObject gObject = null)
+        {
+            var ui = new UI_Slider2_grip();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Slider2_grip Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Slider2_grip();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_enable = (GImage)comp.GetChild("enable");
+            m_disable = (GImage)comp.GetChild("disable");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_enable = null;
+            m_disable = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Slider2_grip.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b6b6a505dd396ad4abc292c81277f484
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Sound/MusicManager.cs

@@ -11,9 +11,9 @@ namespace GFGGame
         private string currentName;
         private AssetOperationHandle handle;
         private Coroutine coroutine;
-        private float normalVolumn = 1f;
-        private float curVolume = 1f;
-        private float changeValue = 0.01f;
+        private float settingVolumn = 1f;       // 设置音量
+        private float tempVolume = 1f;          // 临时音量
+        private float changeBaseValue = 0.01f;  // 缓动单位改变基数
 
         private bool _isOn = true;
         public bool isOn
@@ -43,16 +43,14 @@ namespace GFGGame
             }
         }
 
+
         private void Awake()
         {
             player = this.gameObject.AddComponent<AudioSource>();
             player.loop = true;
             isOn = LocalCache.GetBool(LauncherConfig.MUSIC_KEY, true);
-        }
-
-        private void Start()
-        {
-
+            settingVolumn = LocalCache.GetFloat(LauncherConfig.MUSIC_VOLUMN_KEY, 1.0f);
+            player.volume = settingVolumn;
         }
 
         private void Update()
@@ -62,21 +60,23 @@ namespace GFGGame
                 return;
             }
 
+            // 播放语音时背景音乐变小
             if (VoiceManager.Instance.IsPlaying())
             {
-                curVolume = 0.17f;
+                tempVolume = 0.17f;
             }
             else
             {
-                curVolume = normalVolumn;
+                tempVolume = settingVolumn;
             }
 
-            if (player.volume != curVolume)
+            // 音量缓动变化
+            if (player.volume != tempVolume)
             {
-                player.volume = Mathf.Lerp(player.volume, curVolume, changeValue);
-                if (Mathf.Abs(player.volume - curVolume) <= 0.05)
+                player.volume = Mathf.Lerp(player.volume, tempVolume, changeBaseValue);
+                if (Mathf.Abs(player.volume - tempVolume) <= 0.05)
                 {
-                    player.volume = curVolume;
+                    player.volume = tempVolume;
                 }
             }
         }
@@ -135,9 +135,14 @@ namespace GFGGame
             player.volume = volume;
         }
 
-        public void SetNormalVolumn(float volume)
+        public void SetSettingVolumn(float volume)
+        {
+            settingVolumn = volume;
+        }
+
+        public float GetSettingVolumn()
         {
-            normalVolumn = volume;
+            return settingVolumn;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Sound/SoundManager.cs

@@ -6,11 +6,12 @@ using System.Collections;
 
 namespace GFGGame
 {
-    public class SoundManager : SingletonMonoBase<SoundManager> 
+    public class SoundManager : SingletonMonoBase<SoundManager>
     {
         private AudioSource player;
         private AssetOperationHandle handle;
         private Coroutine coroutine;
+        private float _lastVolumn = 1;
 
         private bool _isOn = true;
         public bool isOn
@@ -21,15 +22,16 @@ namespace GFGGame
             }
             set
             {
-                if(_isOn != value)
+                if (_isOn != value)
                 {
                     _isOn = value;
-                    if(_isOn)
+                    if (_isOn)
                     {
-                        GRoot.inst.soundVolume = 1;
+                        GRoot.inst.soundVolume = _lastVolumn;
                     }
                     else
                     {
+                        _lastVolumn = GRoot.inst.soundVolume;
                         GRoot.inst.soundVolume = 0;
                         Stop();
                     }
@@ -42,16 +44,17 @@ namespace GFGGame
         {
             player = this.gameObject.AddComponent<AudioSource>();
             isOn = LocalCache.GetBool(LauncherConfig.SOUND_KEY, true);
+            player.volume = LocalCache.GetFloat(LauncherConfig.SOUND_VOLUMN_KEY, 1.0f);
         }
 
-        private void Start() 
+        private void Start()
         {
-            
+
         }
 
-        private void Update() 
+        private void Update()
         {
-            
+
         }
 
         public void PlayOneShotCroutine(string path)
@@ -81,5 +84,10 @@ namespace GFGGame
             player.Stop();
         }
 
+        public void SetVolumn(float volumn)
+        {
+            GRoot.inst.soundVolume = volumn;
+        }
+
     }
 }

GameClient/Assets/Game/HotUpdate/Sound/VoiceManager.cs

@@ -28,14 +28,14 @@ namespace GFGGame
                     _isOn = value;
                     if (_isOn)
                     {
-                        GRoot.inst.soundVolume = 1;
+                        //player.volume = 1;
                     }
                     else
                     {
-                        GRoot.inst.soundVolume = 0;
+                        //player.volume = 0;
                         Stop();
                     }
-                    LocalCache.SetBool(LauncherConfig.SOUND_KEY, _isOn);
+                    LocalCache.SetBool(LauncherConfig.VOICE_KEY, _isOn);
                 }
             }
         }
@@ -46,12 +46,13 @@ namespace GFGGame
             player.priority = 256;
             //设置这个声音会大一些
             player.spatialBlend = 1f;
-            isOn = LocalCache.GetBool(LauncherConfig.SOUND_KEY, true);
+            isOn = LocalCache.GetBool(LauncherConfig.VOICE_KEY, true);
+            player.volume = LocalCache.GetFloat(LauncherConfig.VOICE_VOLUMN_KEY, 1.0f);
         }
 
         public void LoadRes(string path)
         {
-            if (!YooAssets.CheckResExist(path))
+            if (player.volume == 0 || !isOn || !YooAssets.CheckResExist(path))
             {
                 return;
             }
@@ -61,7 +62,7 @@ namespace GFGGame
 
         public void PlayVoice()
         {
-            if(player.clip != null)
+            if (player.clip != null)
             {
                 player.Play();
             }
@@ -69,6 +70,11 @@ namespace GFGGame
 
         public void StopVoice()
         {
+            if(player == null)
+            {
+                return;
+            }
+
             player.Stop();
             handle = null;
             player.clip = null;
@@ -139,5 +145,15 @@ namespace GFGGame
         {
             return player.isPlaying;
         }
+
+        public void SetVolumn(float volumn)
+        {
+            player.volume = volumn;
+        }
+
+        public float GetVolumn()
+        {
+            return player.volume;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -219,6 +219,8 @@ namespace GFGGame
                 case ConstItemID.LEAGUE_CONTRIBUTION:
                 case ConstItemID.LEAGUE_CURRENCY:
                 case ConstItemID.LUCKYBOX_COST_2:
+                case ConstItemID.ARENA_CUR_COST:
+                case ConstItemID.ARENA_PAST_COST:
                 case ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2:
                     button.m_imgAdd.visible = true;
                     break;
@@ -286,6 +288,13 @@ namespace GFGGame
                 case ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2:
                     OnClickLuckyBoxActivityProp();
                     break;
+                case ConstItemID.ARENA_CUR_COST:
+                    object[] sourceDatas = new object[] { ConstItemID.ARENA_CUR_COST, null };
+                    GoodsItemTipsController.ShowItemTips(ConstItemID.ARENA_CUR_COST, sourceDatas);
+                    break;
+                case ConstItemID.ARENA_PAST_COST:
+                    GoodsItemTipsController.ShowItemTips(ConstItemID.ARENA_PAST_COST, new object[] { ConstItemID.ARENA_PAST_COST, null });
+                    break;
                 default:
 
                     break;

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -183,7 +183,7 @@ namespace GFGGame
                         List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
                     }
                     isJump = ViewManager.Show<StoreView>(new object[] { storeTabId, storeSubId });
-                    return;
+                    break;
                 // case ConstFunctionId.SHOP_GIFT_BAG:
                 //     // this.Hide();
                 //     int giftBagValue = int.Parse(infos[1]);

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs

@@ -30,7 +30,6 @@ namespace GFGGame
             _ui = UI_LeagueTeaPartyOverUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = true;
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
@@ -71,7 +70,6 @@ namespace GFGGame
         {
             base.OnHide();
             Timers.inst.Remove(UpdateTime);
-
         }
 
         protected override void RemoveEventListener()

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyShowView.cs

@@ -116,7 +116,8 @@ namespace GFGGame
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
         {
-            //ViewManager.Show<LeagueTeaPartyOverView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.DeleteViewStackCountDown(2);
+            ViewManager.Show<LeagueTeaPartyOverView>();
         }
 
         private void UpdateTime(object param)

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -142,7 +142,6 @@ namespace GFGGame
 
             IsTeaParty = (bool)datas[4];
             _autoPlay = _lastStartAutoPlay;
-            _ui.m_btnAutoPlay.selected = _autoPlay;
 
             if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
@@ -165,12 +164,15 @@ namespace GFGGame
                 FightDataManager.Instance.dialogSpeed = _speedAutoPlay;
             }
 
+            // 茶会修改参数
             if (IsTeaParty)
             {
+                _autoPlay = true;
                 _ui.m_c1.selectedIndex = 2;
                 _speedAutoPlay = 1;
             }
 
+            _ui.m_btnAutoPlay.selected = _autoPlay;
             _ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
             StoryDialogDataManager.Instance.Clear();
 
@@ -186,7 +188,11 @@ namespace GFGGame
             Timers.inst.Remove(UpdateShake);
             Timers.inst.Remove(OnScreenEffectComplete);
             ScreenBlackController.Instance.HideBlack();
-            _lastStartAutoPlay = _autoPlay;
+
+            if (!IsTeaParty)
+            {
+                _lastStartAutoPlay = _autoPlay;
+            }
             StopAutoPlay();
             VoiceManager.Instance.StopVoice();
 
@@ -275,6 +281,7 @@ namespace GFGGame
 
         private void OnClickBtnSpeedUp()
         {
+
             //如果没有自动播放先开始自动播放
             if (!_autoPlay)
             {
@@ -288,6 +295,12 @@ namespace GFGGame
             }
             FightDataManager.Instance.dialogSpeed = _speedAutoPlay;
             UpdateSpeedUpBtn();
+
+            //if (_speedAutoPlay > 1)
+            //{
+            //    VoiceManager.Instance.StopVoice();
+            //}
+                
         }
 
         private void OnClickBtnAutoPlay()
@@ -458,11 +471,11 @@ namespace GFGGame
                 {
                     yield return new WaitForEndOfFrame();
                 }
-                if (_autoPlay)
-                {
-                    _ui.m_btnAutoPlay.selected = false;
-                    OnClickBtnAutoPlay();
-                }
+                //if (_autoPlay)
+                //{
+                //    _ui.m_btnAutoPlay.selected = false;
+                //    OnClickBtnAutoPlay();
+                //}
             }
 
             _ui.m_loaMask.url = ResPathUtil.GetBgImgPath(storyDialogCfg.maskRes);

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs

@@ -51,8 +51,7 @@ namespace GFGGame
             this._ui.m_inputName.text = "";
 
             _isNewPlayer = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) == 1;
-            _ui.m_txtNeed.visible = !_isNewPlayer;
-            _ui.m_loaIcon.visible = !_isNewPlayer;
+            _ui.m_c1.SetSelectedIndex(_isNewPlayer ? 0 : 1);
 
             long haveNum = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
             long needNum = GlobalCfgArray.globalCfg.changeNameCostArr[1];

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs

@@ -1,4 +1,4 @@
-using UI.RoleInfo;
+锘縰sing UI.RoleInfo;
 using System.Text.RegularExpressions;
 using UnityEngine;
 using FairyGUI;
@@ -11,6 +11,7 @@ namespace GFGGame
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
 
+
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -32,22 +33,31 @@ namespace GFGGame
             packageName = UI_SettingUI.PACKAGE_NAME;
             _ui = UI_SettingUI.Create();
             this.viewCom = _ui.target;
-            this.viewCom.Center();
-            this.modal = true;
+            isfullScreen = true;
+            isReturnView = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
 
             _ui.m_btnExit.onClick.Add(OnClickBtnExit);
-            _ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
+            _ui.m_btnLogout.target.onClick.Add(OnClickBtnLogout);
             _ui.m_btnSound.onClick.Add(OnClickBtnSound);
             _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
-            AddEffect();
+            _ui.m_btnVoice.onClick.Add(OnClickBtnVoice);
+            _ui.m_btnChooseMainBg.onClick.Add(OnClickBtnChangeMainBg);
+
+            _ui.m_voiceSlider.target.onChanged.Add(OnChangeVoiceVolumn);
+            _ui.m_musicSlider.target.onChanged.Add(OnChangeMusicVolumn);
+            _ui.m_soundSlider.target.onChanged.Add(OnChangeSoundVolumn);
+            _ui.m_btnBinding.onClick.Add(OnClickPhoneBinding);
+            _ui.m_btnGiftCode.target.onClick.Add(OnClickGiftCode);
+            _ui.m_settingTypeList.itemRenderer = RenderListType;
+            _ui.m_settingTypeList.numItems = _ui.m_settingTypeList.numItems;
+
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            AddEffect();
-            _ui.m_btnSound.selected = SoundManager.Instance.isOn;
-            _ui.m_btnMusic.selected = MusicManager.Instance.isOn;
+            InitVolumnSetting();
         }
 
         protected override void OnHide()
@@ -55,30 +65,22 @@ namespace GFGGame
             base.OnHide();
         }
 
-        private void AddEffect()
-        {
-            //邊框左上角特效
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderLeftTop, "ui_Activity", "Com_window_L_up");
-
-            //邊框右下角特效
-            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderRightDowm, "ui_Activity", "Com_window_R_Down");
-        }
-
         private void OnClickBtnExit()
         {
-            AlertSystem.Show("确认返回登录页吗？")
-                .SetLeftButton(true)
-                .SetRightButton(true, "确认", (object data) =>
-                {
-                    GameController.QuitToLoginView(false);
-                });
+            Hide();
+            //AlertSystem.Show("纭��杩斿洖鐧诲綍椤靛悧锛�")
+            //    .SetLeftButton(true)
+            //    .SetRightButton(true, "纭��", (object data) =>
+            //    {
+            //        GameController.QuitToLoginView(false);
+            //    });
         }
 
         private void OnClickBtnLogout()
         {
-            AlertSystem.Show("确认注销当前账号吗？")
+            AlertSystem.Show("纭��娉ㄩ攢褰撳墠璐﹀彿鍚楋紵")
                 .SetLeftButton(true)
-                .SetRightButton(true, "确认", (object data) =>
+                .SetRightButton(true, "纭��", (object data) =>
                 {
                     GameController.QuitToLoginView(true);
                 });
@@ -88,12 +90,113 @@ namespace GFGGame
         {
             SoundManager.Instance.isOn = _ui.m_btnSound.selected;
 
+            bool isOn = _ui.m_btnSound.selected;
+            _ui.m_soundSlider.target.touchable = isOn;
+            UI_Slider2 slider1 = UI_Slider2.Proxy(_ui.m_soundSlider.target);
+            slider1.m_c1.SetSelectedIndex(isOn ? 0 : 1);
+            slider1.m_progressBar.fillAmount = isOn ? (float)_ui.m_soundSlider.target.value / 100 : 0;
+            UI_Slider2.ProxyEnd();
         }
 
         private void OnClickBtnMusic()
         {
             MusicManager.Instance.isOn = _ui.m_btnMusic.selected;
 
+            bool isOn = _ui.m_btnMusic.selected;
+            _ui.m_musicSlider.target.touchable = isOn;
+            UI_Slider2 slider1 = UI_Slider2.Proxy(_ui.m_musicSlider.target);
+            slider1.m_c1.SetSelectedIndex(isOn ? 0 : 1);
+            slider1.m_progressBar.fillAmount = isOn ? (float)_ui.m_musicSlider.target.value / 100 : 0;
+            UI_Slider2.ProxyEnd();
+        }
+
+        private void OnClickBtnVoice()
+        {
+            VoiceManager.Instance.isOn = _ui.m_btnVoice.selected;
+
+            bool isOn = _ui.m_btnVoice.selected;
+            _ui.m_voiceSlider.target.touchable = isOn;
+            UI_Slider2 slider1 = UI_Slider2.Proxy(_ui.m_voiceSlider.target);
+            slider1.m_c1.SetSelectedIndex(isOn ? 0 : 1);
+            slider1.m_progressBar.fillAmount = isOn ? (float)_ui.m_voiceSlider.target.value / 100 : 0;
+            UI_Slider2.ProxyEnd();
+        }
+
+        private void OnChangeVoiceVolumn()
+        {
+            float volumn = (float)_ui.m_voiceSlider.target.value / 100;
+
+            UI_Slider2 slider1 = UI_Slider2.Proxy(_ui.m_voiceSlider.target);
+            slider1.m_progressBar.fillAmount = volumn;
+            UI_Slider2.ProxyEnd();
+
+            VoiceManager.Instance.SetVolumn(volumn);
+            LocalCache.SetFloat(LauncherConfig.VOICE_VOLUMN_KEY, volumn);
+        }
+
+        private void OnChangeMusicVolumn()
+        {
+            float volumn = (float)_ui.m_musicSlider.target.value / 100;
+            UI_Slider2 slider1 = UI_Slider2.Proxy(_ui.m_musicSlider.target);
+            slider1.m_progressBar.fillAmount = volumn;
+            UI_Slider2.ProxyEnd();
+            MusicManager.Instance.SetSettingVolumn(volumn);
+            MusicManager.Instance.SetVolume(volumn);
+            LocalCache.SetFloat(LauncherConfig.MUSIC_VOLUMN_KEY, volumn);
+        }
+
+        private void OnChangeSoundVolumn()
+        {
+            float volumn = (float)_ui.m_soundSlider.target.value / 100;
+            UI_Slider2 slider1 = UI_Slider2.Proxy(_ui.m_soundSlider.target);
+            slider1.m_progressBar.fillAmount = volumn;
+            UI_Slider2.ProxyEnd();
+
+            SoundManager.Instance.SetVolumn(volumn);
+            LocalCache.SetFloat(LauncherConfig.SOUND_VOLUMN_KEY, volumn);
+        }
+
+        private void OnClickBtnChangeMainBg()
+        {
+            ViewManager.Show<MainBgChooseView>();
+        }
+
+        private void InitVolumnSetting()
+        {
+            _ui.m_btnMusic.selected = MusicManager.Instance.isOn;
+            _ui.m_musicSlider.target.value = MusicManager.Instance.GetSettingVolumn() * 100;
+            OnClickBtnMusic();
+
+            _ui.m_btnSound.selected = SoundManager.Instance.isOn;
+            _ui.m_soundSlider.target.value = GRoot.inst.soundVolume * 100;
+            OnClickBtnSound();
+
+            _ui.m_btnVoice.selected = VoiceManager.Instance.isOn;
+            _ui.m_voiceSlider.target.value = VoiceManager.Instance.GetVolumn() * 100;
+            OnClickBtnVoice();
         }
+
+        private void OnClickPhoneBinding()
+        {
+
+        }
+
+        private void OnClickGiftCode()
+        {
+
+        }
+
+        /// <summary>
+        /// 鍒濆�鍖栦笂鏂归€夋嫨鑿滃崟锛屽悓姝ユ寜閽�寜涓嬪拰鏅�€氱姸鎬佺殑鏂囨湰
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="item"></param>
+        private void RenderListType(int index, GObject item)
+        {
+            UI_Button6 button6 = UI_Button6.Proxy(item);
+            button6.m_title1.text = button6.target.title;
+            UI_Button6.ProxyEnd();
+        }
+
     }
 }

GameClient/Assets/ResIn/Prefab/StoryDialogSelfImg/StoryDialogDressUpObj.prefab

@@ -55,7 +55,6 @@ GameObject:
   m_Component:
   - component: {fileID: 6878158353358657781}
   - component: {fileID: 639594231881422594}
-  - component: {fileID: 5845869005981817730}
   m_Layer: 0
   m_Name: Camera
   m_TagString: Untagged
@@ -125,14 +124,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!81 &5845869005981817730
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4595075775032341738}
-  m_Enabled: 1
 --- !u!1 &7725187359309704410
 GameObject:
   m_ObjectHideFlags: 0