Merge remote-tracking branch 'remotes/origin/master' into ios_test

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs
#	GameClient/Assets/Game/HotUpdate/Game.HotUpdate.asmdef
#	GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs
#	GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs
#	GameClient/Assets/Game/Launcher/Platform/QDManagerInit.cs
#	GameClient/ProjectSettings/ProjectSettings.asset

.gitignore

@@ -47,3 +47,10 @@
 GameClient/Assets/Samples/
 GameClient/Assets/Samples.meta
 /StaticRes
+/GameClient/.idea/.idea.GameClient/.idea/indexLayout.xml
+/GameClient/Assets/Plugins/Android/libs/douyou-release.aar
+/GameClient/Assets/Plugins/Android/libs/douyou-release.aar.meta
+/GameClient/Assets/Plugins/Android/libs/douyouTT-release.aar
+/GameClient/Assets/Plugins/Android/libs/douyouTT-release.aar.meta
+/GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java
+/GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java.meta

GameClient/Assets/Bugly/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:GameClient/Assets/Plugins/Android/res/mipmap-ldpi/ic_launcher.png.meta
+guid: e6023d29d3fefd14f9c937a906bf7dfb
+=======
 guid: 0dd2027a6278544d4acc46c208b9f5f5
+>>>>>>> remotes/origin/master:GameClient/Assets/ThirdParty/Bugly/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly.meta
 DefaultImporter:
   externalObjects: {}
   userData: 

GameClient/Assets/Icons.meta → GameClient/Assets/Demo.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a6953a2349995cd41b3bdf12dfa52e21
+guid: 5385286e227ca4f5f8a440d911f5f233
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Demo/Demo.cs

@@ -0,0 +1,800 @@
+using UnityEngine;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using cn.sharesdk.unity3d;
+using LitJson;
+public class Demo : MonoBehaviour {
+
+	public GUISkin demoSkin;
+	public ShareSDK ssdk;
+	
+	public MobSDK mobsdk;
+	
+	// Use this for initialization
+	void Start ()
+	{	
+		ssdk = gameObject.GetComponent<ShareSDK>();
+		ssdk.authHandler = OnAuthResultHandler;
+		ssdk.shareHandler = OnShareResultHandler;
+		ssdk.showUserHandler = OnGetUserInfoResultHandler;
+		ssdk.getFriendsHandler = OnGetFriendsResultHandler;
+		ssdk.followFriendHandler = OnFollowFriendResultHandler;
+		ssdk.clientValidForAndroidHandler = onIsClientValidForAndroid;
+
+		mobsdk = gameObject.GetComponent<MobSDK>();
+        #if UNITY_ANDROID
+		//ShareSDKRestoreScene.setRestoreSceneListener(OnRestoreScene);
+		
+        #elif UNITY_IPHONE
+		mobsdk.getPolicy = OnFollowGetPolicy;
+        ssdk.wxRequestHandler = GetWXRequestTokenResultHandler;
+        //ShareSDKRestoreScene.setRestoreSceneListener(OnRestoreScene);
+        #endif
+
+    }
+
+	// Update is called once per frame
+	void Update () 
+	{
+		if (Input.GetKeyDown(KeyCode.Escape)) {
+			Application.Quit();
+		}
+	}
+	
+	void OnGUI ()
+	{
+
+		GUI.skin = demoSkin;
+		
+		float scale = 1.0f;
+
+		if (Application.platform == RuntimePlatform.IPhonePlayer)
+		{
+			scale = Screen.width / 320;
+		}
+		
+		//float btnWidth = 165 * scale;
+		float btnWidth= Screen.width / 5 * 2;
+        float btnWidth2 = btnWidth + 80 * scale;
+
+        float btnHeight = Screen.height / 25;
+		float btnTop = 30 * scale;
+		float btnGap = 20 * scale;
+		GUI.skin.button.fontSize = Convert.ToInt32(13 * scale);
+
+		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 - btnWidth, btnTop, btnWidth, btnHeight), "Authorize"))
+		{
+			print(ssdk == null);
+
+#if UNITY_ANDROID
+		    ssdk.Authorize(PlatformType.SinaWeibo);
+#elif UNITY_IPHONE
+            ssdk.Authorize(PlatformType.Twitter);
+#endif
+		}
+
+		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Get User Info"))
+		{
+            //ssdk.GetUserInfo(PlatformType.Douyin);
+
+            //print("share result :" + ssdk.GetUserInfo(PlatformType.WeChat));
+			print("share result :" + ssdk.Authorize(PlatformType.WeChat));
+			
+			
+			//print("share result : " + ssdk.GetUserInfo(PlatformType.GooglePlus));
+        }
+
+		btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 - btnWidth, btnTop, btnWidth, btnHeight), "Show Share Menu"))
+		{
+            	ShareContent content = new ShareContent();
+
+            //	//(Android only) 隐藏九宫格里面不需要用到的平台（仅仅是不显示平台）
+            //	//(Android only) 也可以把jar包删除或者把Enabl属性e改成false（对应平台的全部功能将用不了）
+                String[] platfsList = {((int)PlatformType.Facebook).ToString(), ((int)PlatformType.TencentWeibo).ToString()};
+            	content.SetHidePlatforms (platfsList);
+
+            	content.SetText("this is a test string.");
+				content.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
+				content.SetUrl("https://www.mob.com");
+            	content.SetTitle("test title");
+				content.SetDouyin_shareActionMode(1);
+
+            //(Android only) 针对Android绕过审核的多图分享，传图片String数组 
+            //String[] imageArray =  {"/sdcard/test.jpg", "http://f1.webshare.mob.com/dimgs/1c950a7b02087bf41bc56f07f7d3572c11dfcf36.jpg", "/sdcard/test.jpg"};
+            //content.SetImageArray (imageArray);
+
+            //content.SetTitleUrl("https://www.baidu.com/");
+            //content.SetSite("Test site params test test");
+            //content.SetSiteUrl("https://www.baidu.com/");
+            //content.SetUrl("https://www.baidu.com/");
+            //content.SetComment("test description");
+            //content.SetMusicUrl("http://i.y.qq.com/v8/playsong.html?hostuin=0&songid=&songmid=002x5Jje3eUkXT&_wv=1&source=qq&appshare=iphone&media_mid=002x5Jje3eUkXT");
+
+            content.SetShareType(ContentType.Image);
+
+			//不同平台分享不同内容
+			//ShareContent customizeShareParams = new ShareContent();
+			//customizeShareParams.SetText("Sina share content");
+			//customizeShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			//customizeShareParams.SetShareType(ContentType.Text);
+			//customizeShareParams.SetObjectID("SinaID");
+			//content.SetShareContentCustomize(PlatformType.SinaWeibo, customizeShareParams);
+
+			//KakaoTalk原生只支持分享链接
+			ShareContent kakaoTalkCustomizeShareParams = new ShareContent();
+			kakaoTalkCustomizeShareParams.SetUrl("http://www.mob.com");
+			kakaoTalkCustomizeShareParams.SetShareType(ContentType.Webpage);
+			kakaoTalkCustomizeShareParams.SetTemplateId("11820");
+			content.SetShareContentCustomize(PlatformType.KakaoTalk, kakaoTalkCustomizeShareParams);
+
+			//KakaoStory分享图片
+			ShareContent kakaoStoryCustomizeShareParams = new ShareContent();
+			kakaoStoryCustomizeShareParams.SetText("");
+			kakaoStoryCustomizeShareParams.SetTitle("http://www.mob.com");
+			kakaoStoryCustomizeShareParams.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
+			kakaoStoryCustomizeShareParams.SetUrl("");
+			kakaoStoryCustomizeShareParams.SetPermission("0");
+			kakaoStoryCustomizeShareParams.SetEnableShare(true);
+
+			Hashtable androidExecParams = new Hashtable();
+			androidExecParams["andParam1"] = "value1";
+			androidExecParams["andParam2"] = "value2";
+			kakaoStoryCustomizeShareParams.SetAndroidExecParam(androidExecParams);
+
+			Hashtable iOSExecParams = new Hashtable();
+			iOSExecParams["iosParam1"] = "value1";
+			iOSExecParams["iosParam2"] = "value2";
+			kakaoStoryCustomizeShareParams.SetIphoneExecParam(iOSExecParams);
+
+			kakaoStoryCustomizeShareParams.SetShareType(ContentType.Image);
+			content.SetShareContentCustomize(PlatformType.KakaoStory, kakaoStoryCustomizeShareParams);
+
+			//TikTok分享多图
+			String[] imageArray = { "http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg", "http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg" };
+			ShareContent tiktokCustomizeShareParams = new ShareContent();
+			tiktokCustomizeShareParams.SetImageArray(imageArray);
+			tiktokCustomizeShareParams.SetShareType(ContentType.Image);
+			content.SetShareContentCustomize(PlatformType.TikTok, tiktokCustomizeShareParams);
+			
+#if UNITY_IPHONE
+			//SnapChat分享图片
+			ShareContent snapChatShareParams = new ShareContent();
+			snapChatShareParams.SetTitle("https://www.mobtech.com");
+			snapChatShareParams.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
+			snapChatShareParams.setSnapStickerImage("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
+			snapChatShareParams.setSnapStickerAnimated(0);
+			snapChatShareParams.setSnapStickerRotation(0);
+			snapChatShareParams.SetShareType(ContentType.Image);
+			content.SetShareContentCustomize(PlatformType.SnapChat, snapChatShareParams);
+            //快手SDK-分享私信
+            ShareContent ksShareParams = new ShareContent();
+            ksShareParams.SetTitle("title");
+            ksShareParams.SetDesc("desc");
+            ksShareParams.SetLinkURL("https://www.mob.com");
+            ksShareParams.SetThumbImageUrl("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
+            ksShareParams.SetExtraInfo("message");
+            ksShareParams.SetShareType(ContentType.Message);
+			content.SetShareContentCustomize(PlatformType.KuaiShou, ksShareParams);
+#endif
+
+			//抖音-分享系统视频
+			//ShareContent dyShareParams = new ShareContent();
+			//dyShareParams.SetAssetLocalIdsArray();  //此处应传入从相册取得的图片或者视频文件的Assetlocalidentifier集合
+			//dyShareParams.SetDouyinHashtag("hastag");
+			//Hashtable extraInfo = new Hashtable();
+			//extraInfo["iosParam1"] = "value1";
+			//extraInfo["iosParam2"] = "value2";
+			//dyShareParams.SetDouyin_extraInfo(extraInfo);
+			//dyShareParams.SetShareType(ContentType.Video);
+			//content.SetShareContentCustomize(PlatformType.Douyin, dyShareParams);
+
+			//Facebook分享图片
+			ShareContent fbShareParams = new ShareContent();
+			fbShareParams.SetText("text");
+			fbShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			fbShareParams.setFacebookShareType(FacebookShareType.Native);
+			fbShareParams.SetShareType(ContentType.Image);
+			content.SetShareContentCustomize(PlatformType.Facebook, fbShareParams);
+
+			//FacebookMessenger分享图片
+			ShareContent messShareParams = new ShareContent();
+			messShareParams.SetTitle("title");
+			messShareParams.SetUrl("http://www.mob.com");
+			messShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			messShareParams.SetShareType(ContentType.Image);
+			content.SetShareContentCustomize(PlatformType.FacebookMessenger, messShareParams);
+
+			//Instagram分享图片
+			ShareContent insShareParams = new ShareContent();
+			insShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			insShareParams.SetMenuX(0);
+			insShareParams.SetMenuY(0);
+			content.SetShareContentCustomize(PlatformType.Instagram, insShareParams);
+
+			//LinkedIn分享链接
+			ShareContent linkedInShareParams = new ShareContent();
+			linkedInShareParams.SetTitle("title");
+			linkedInShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			linkedInShareParams.SetUrl("http://www.mob.com");
+			linkedInShareParams.SetTitle("title");
+			linkedInShareParams.SetDesc("desc");
+			linkedInShareParams.SetShareType(ContentType.Webpage);
+			content.SetShareContentCustomize(PlatformType.LinkedIn, linkedInShareParams);
+
+
+			//Instapaper分享链接
+			ShareContent instapapaerShareParams = new ShareContent();
+			instapapaerShareParams.SetTitle("title");
+			instapapaerShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			instapapaerShareParams.SetUrl("http://www.mob.com");
+			instapapaerShareParams.SetTitle("title");
+			instapapaerShareParams.SetShareType(ContentType.Webpage);
+			content.SetShareContentCustomize(PlatformType.Instapaper, instapapaerShareParams);
+
+			//Pocket分享链接
+			ShareContent pocketShareParams = new ShareContent();
+			pocketShareParams.SetTitle("title");
+			pocketShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			pocketShareParams.SetUrl("http://www.mob.com");
+			pocketShareParams.SetTitle("title");
+			pocketShareParams.SetShareType(ContentType.Webpage);
+			content.SetShareContentCustomize(PlatformType.Pocket, pocketShareParams);
+
+			//有道分享图片
+			ShareContent youdaoShareParams = new ShareContent();
+			youdaoShareParams.SetText("text");
+			youdaoShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			youdaoShareParams.SetTitle("title");
+			youdaoShareParams.SetSource("MOB");
+			youdaoShareParams.SetAuthor("mob");
+			content.SetShareContentCustomize(PlatformType.YouDaoNote, youdaoShareParams);
+
+#if UNITY_IPHONE
+			//Dropbox分享图片
+			ShareContent dropboxShareParams = new ShareContent();
+			//dropboxShareParams.SetAttachmentPath("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
+			var files = System.IO.Directory.GetFiles(Application.dataPath, "cat.mp4", System.IO.SearchOption.AllDirectories);
+			string filePath = files[0];
+			dropboxShareParams.SetAttachmentPath(filePath);
+			content.SetShareContentCustomize(PlatformType.Dropbox, dropboxShareParams);
+#endif
+			//明道分享链接
+			ShareContent mingdaoShareParams = new ShareContent();
+			mingdaoShareParams.SetTitle("title");
+			mingdaoShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			mingdaoShareParams.SetUrl("http://www.mob.com");
+			mingdaoShareParams.SetTitle("title");
+			mingdaoShareParams.SetShareType(ContentType.Webpage);
+			content.SetShareContentCustomize(PlatformType.MingDao, mingdaoShareParams);
+
+
+			//绿洲分享图片
+			ShareContent oasisShareParams = new ShareContent();
+			oasisShareParams.SetTitle("title");
+			oasisShareParams.SetText("text");
+			oasisShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			oasisShareParams.SetShareType(ContentType.Image);
+			content.SetShareContentCustomize(PlatformType.Oasis, oasisShareParams);
+
+
+			//telegram分享图片
+			ShareContent telegramShareParams = new ShareContent();
+			telegramShareParams.SetText("text");
+			telegramShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+			telegramShareParams.SetShareType(ContentType.Image);
+			content.SetShareContentCustomize(PlatformType.Telegram, telegramShareParams);
+
+			////Tumblr分享视频
+			//ShareContent tumblrShareParams = new ShareContent();
+			//var files = System.IO.Directory.GetFiles(Application.dataPath, "cat.mp4", System.IO.SearchOption.AllDirectories);
+			//string filePath = files[0];
+			//tumblrShareParams.SetTitle("title");
+			//tumblrShareParams.SetMediaDataPath(filePath);
+			//tumblrShareParams.SetShareType(ContentType.Video);
+			//content.SetShareContentCustomize(PlatformType.Tumblr, tumblrShareParams);
+
+			//优先客户端分享
+			content.SetEnableClientShare(true);
+                
+            //使用微博API接口应用内分享 iOS only
+            //content.SetEnableSinaWeiboAPIShare(true);
+
+            //通过分享菜单分享
+            ssdk.ShowPlatformList (null, content, 100, 100);
+
+		}
+			
+		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Show Share View"))
+		{
+			ShareContent content = new ShareContent();
+			content.SetText("this is a test string.");
+			content.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
+			content.SetTitle("test title");
+			content.SetTitleUrl("http://www.mob.com");
+			content.SetSite("Mob-ShareSDK");
+			content.SetSiteUrl("http://www.mob.com");
+			content.SetUrl("http://www.mob.com");
+			content.SetComment("test description");
+			content.SetMusicUrl("http://mp3.mwap8.com/destdir/Music/2009/20090601/ZuiXuanMinZuFeng20090601119.mp3");
+			content.SetShareType(ContentType.Image);
+
+			ssdk.ShowShareContentEditor (PlatformType.SinaWeibo, content);
+		}
+#if UNITY_ANDROID
+
+#elif UNITY_IPHONE
+		btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Share With Activity"))
+		{
+			//系统分享示例
+			ShareContent content = new ShareContent();
+			content.SetText("this is a test string.");
+			content.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
+			content.SetTitle("test title");
+			content.SetTitleUrl("http://www.mob.com");
+			content.SetUrl("http://www.mob.com");
+			content.SetShareType(ContentType.Image);
+			ssdk.ShareContentWithActivity (PlatformType.WeChat, content);
+		}
+#endif
+
+
+
+		btnTop += btnHeight + 20 * scale;
+        if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Share Content"))
+		{
+
+            //抖音-分享本地视频
+            ShareContent content = new ShareContent();
+			//var files = System.IO.Directory.GetFiles(Application.dataPath, "cat.mp4", System.IO.SearchOption.AllDirectories);
+			//string filePath = files[0];
+			//content.SetUrl(filePath);
+			//分享图片到IM
+			content.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
+			content.SetShareType(ContentType.Image);
+			content.SetDouyin_shareActionMode(1);
+            ssdk.ShareContent(PlatformType.Douyin, content);
+
+            /*iOS Only*/
+
+            ////※单个平台的分享示例如下※：
+
+            ////调用公用参数构造方法的，通过如下方式，如TikTok分享多图
+            //String[] imageArray = { "http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg", "http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg" };
+            //content.SetImageArray(imageArray);
+            //content.SetShareType(ContentType.Image);
+            //ssdk.ShareContent(PlatformType.TikTok, content);
+
+
+            ////调用自定义的参数构造方法的，需要通过如下方式，如：KakaoTalk
+            //ShareContent customizeShareParams = new ShareContent();
+            //customizeShareParams.SetUrl("http://www.mob.com");
+            //customizeShareParams.SetShareType(ContentType.Webpage);
+            //customizeShareParams.SetTemplateId("11820");
+            //content.SetShareContentCustomize(PlatformType.KakaoTalk, customizeShareParams);
+            //ssdk.ShareContent(PlatformType.KakaoTalk, content);
+
+            ////快手SDK-分享私信
+            //ShareContent ksShareParams = new ShareContent();
+            //ksShareParams.SetTitle("title");
+            //ksShareParams.SetDesc("desc");
+            //ksShareParams.SetLinkURL("https://www.mob.com");
+            //ksShareParams.SetThumbImageUrl("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
+            //ksShareParams.SetExtraInfo("message");
+            //ksShareParams.SetShareType(ContentType.Message);
+            //content.SetShareContentCustomize(PlatformType.KuaiShou, ksShareParams);
+            //ssdk.ShareContent(PlatformType.KuaiShou, content);
+
+            ////reddit分享链接
+            //ShareContent redditShareParams = new ShareContent();
+            //redditShareParams.SetText("text");
+            //redditShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
+            //redditShareParams.SetUrl("https://www.mob.com");
+            //redditShareParams.SetTitle("title");
+            //redditShareParams.SetShareType(ContentType.Webpage);
+            //content.SetShareContentCustomize(PlatformType.Reddit, redditShareParams);
+
+
+            // ShareContent content = new ShareContent();
+            // content.SetText("Test text");
+            // content.SetImageUrl("http://pic28.photophoto.cn/20130818/0020033143720852_b.jpg");
+            // ssdk.ShareContent (PlatformType.Twitter, content);
+
+        }
+
+		//if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Get Friends SinaWeibo "))
+		//{
+		//获取新浪微博好友，第一页，每页15条数据
+		//print ("Click Btn Of Get Friends SinaWeibo");
+		//			ssdk.GetFriendList (PlatformType.SinaWeibo, 15, 0);
+		//ssdk.openMiniProgram("gh_afb25ac019c9","pages/index/index",0);
+		//}
+
+		btnTop += btnHeight + 20 * scale;
+        if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Get Token "))
+		{
+			Hashtable authInfo = ssdk.GetAuthInfo (PlatformType.WeChat);			
+			print ("share result :");
+			print (MiniJSON.jsonEncode(authInfo));
+		}
+			
+		//if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap , btnTop, btnWidth, btnHeight), "Close SSO Auth"))
+		//{
+			//ssdk.DisableSSO (true);			
+		//}
+
+		btnTop += btnHeight + 20 * scale;
+        if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Remove Authorize "))
+		{
+			ssdk.CancelAuthorize (PlatformType.WeChat);			
+		}
+
+        //if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Add Friend "))
+        //{
+        //关注新浪微博
+        //ssdk.AddFriend (PlatformType.SinaWeibo, "3189087725");			
+        //}
+
+        btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "ShareWithContentName(iOS only)"))
+		{
+			Hashtable customFields = new Hashtable ();
+			customFields["imgUrl"] = "http://ww1.sinaimg.cn/mw690/006dJESWgw1f6iyb8bzraj31kw0v67a2.jpg";
+			//根据配置文件分享【本接口功能仅暂时支持iOS】
+			ssdk.ShareWithContentName(PlatformType.SinaWeibo, "ShareSDK", customFields);		
+		}
+
+		//btnTop += btnHeight + 20 * scale;
+		//if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "ShowShareMenuWithContentName(iOS only)"))
+		//{
+		//	Hashtable customFields = new Hashtable ();
+		//	customFields["imgUrl"] = "http://ww1.sinaimg.cn/mw690/006dJESWgw1f6iyb8bzraj31kw0v67a2.jpg";
+		//	//根据配置文件展示分享菜单分享【本接口功能仅暂时支持iOS】
+		//	ssdk.ShowPlatformListWithContentName ("ShareSDK", customFields, null, 100, 100);
+		//}
+
+		btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "ShowShareViewWithContentName(iOS only)"))
+		{
+			Hashtable customFields = new Hashtable ();
+			//根据配置文件展示编辑界面分享【本接口功能仅暂时支持iOS】
+			customFields["imgUrl"] = "http://ww1.sinaimg.cn/mw690/006dJESWgw1f6iyb8bzraj31kw0v67a2.jpg";
+			ssdk.ShowShareContentEditorWithContentName(PlatformType.SinaWeibo, "ShareSDK", customFields);		
+		}
+
+		btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "SMS Authorize(Android only)"))
+		{
+			ssdk.Authorize(PlatformType.SMS);		
+		}
+
+		btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "submitPolicyGrantResult"))
+		{
+			
+			Debug.Log("ssdk ======> " + ssdk);
+			Debug.Log("mobsdk ======> " + mobsdk);
+			
+			mobsdk.submitPolicyGrantResult(true);
+			Debug.Log("mobsdk submitPolicyGrantResult======> " + mobsdk.submitPolicyGrantResult(true).ToString());
+		}
+
+		btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "getPrivacyPolicy"))
+		{
+			
+			Debug.Log("ssdk ======> " + ssdk);
+			Debug.Log("mobsdk ======> " + mobsdk);
+			#if UNITY_IPHONE
+            mobsdk.getPrivacyPolicy(true,mobsdk.getDeviceCurrentLanguage());
+#elif UNITY_ANDROID
+			mobsdk.getPrivacyPolicy(true, "en");
+			Debug.Log("mobsdk getPrivacyPolicy======> " + mobsdk.getPrivacyPolicy(true, "en"));
+#endif
+		}
+
+
+		btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Open wxMiniProgram(iOS only)"))
+		{
+#if UNITY_IPHONE
+			ssdk.openMiniProgram("gh_afb25ac019c9", "pages/index/index", 0);
+#elif UNITY_ANDROID
+#endif
+
+		}
+
+		btnTop += btnHeight + 20 * scale;
+		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 - btnWidth, btnTop, btnWidth, btnHeight), "Share wxMiniProgram"))
+		{
+#if UNITY_IPHONE
+            ShareContent content = new ShareContent ();
+			content.SetTitle ("MiniProgram");
+			content.SetText ("test MiniProgram");
+			content.SetUrl("http://www.mob.com");
+			content.SetMiniProgramPath ("pages/index/index");
+			content.SetThumbImageUrl ("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
+			content.SetMiniProgramHdThumbImage ("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
+			content.SetMiniProgramUserName ("gh_afb25ac019c9");
+			content.SetMiniProgramWithShareTicket (true);
+            // iOS/Android 微信小程序的版本（0-正式，1-开发，2-体验）
+            content.SetMiniProgramType (0);
+			content.SetShareType (ContentType.MiniProgram);
+
+			ShareContent shareContent = new ShareContent ();
+			shareContent.SetShareContentCustomize (PlatformType.WeChat, content);
+			ssdk.ShareContent (PlatformType.WeChat, shareContent);
+#elif UNITY_ANDROID
+            ShareContent content = new ShareContent ();
+            content.SetTitle ("MiniProgram");
+            content.SetText ("test MiniProgram");
+            content.SetUrl("http://www.mob.com");
+            content.SetMiniProgramType (0);
+            content.SetMiniProgramUserName ("gh_52568203455c");
+            content.SetImageUrl("http://pic28.photophoto.cn/20130818/0020033143720852_b.jpg");
+            content.SetShareType (ContentType.MiniProgram);
+            
+            ShareContent shareContent = new ShareContent ();
+			shareContent.SetShareContentCustomize (PlatformType.WeChat, content);
+			ssdk.ShareContent (PlatformType.WeChat, shareContent);
+#endif
+		}
+
+      btnTop += btnHeight + 20 * scale;
+        if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "isClientValidForAndroid -QQ"))
+      {
+         ssdk.isClientValidForAndroid(PlatformType.QQ);
+      }
+
+
+      btnTop += btnHeight + 20 * scale;
+      if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Share qqMiniProgram(iOS only)"))
+        {
+#if UNITY_IPHONE
+            ShareContent content = new ShareContent();
+            content.SetTitle("MiniProgram");
+            content.SetText("test MiniProgram");
+            content.SetUrl("http://www.mob.com");
+            content.SetThumbImageUrl("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
+            content.SetMiniProgramPath("pages/index/index");
+            content.SetMiniProgramHdThumbImage("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
+            content.SetMiniProgramAppID("1109762672");
+            content.SetMiniProgramWebpageUrl("www.qq.com");
+            //iOS/Android QQ小程序的类型，默认正式版(3)，可选测试版(1)、预览版(4)
+            content.SetMiniProgramType(3);
+            content.SetShareType(ContentType.MiniProgram);
+
+            ShareContent shareContent = new ShareContent();
+            shareContent.SetShareContentCustomize(PlatformType.QQ, content);
+            ssdk.ShareContent(PlatformType.QQ, shareContent);
+
+#elif UNITY_ANDROID
+            //===============================================================
+            //when you test QQ miniprogram, you should use this params
+            //At the same time, the package name and signature should 
+            //correspond to the package name signature of the specific 
+            //QQ sharing small program applied in the background of tencent
+            //===============================================================
+            //ShareContent content = new ShareContent();
+            //content.SetTitle("MiniProgram");
+            //content.SetText("test MiniProgram");
+            //content.SetTitleUrl("http://www.mob.com");
+            //content.SetImageUrl("http://www.3wyu.com/wp-content/uploads/6e0eaf15gy1fvr5tnm2dfj20f108gtad.jpg");//必须为网络图片
+            //content.SetShareType(ContentType.QQ_MINI_PROGRAM);
+            //content.SetMiniProgramAppID("1108318575");
+            //content.SetMiniProgramPath("page/share/index.html?share_name=QQ%E9%9F%B3%E4%B9%90&share_key=5aIqFGg&from=disk");
+            //content.SetQQMiniProgramType("");
+
+            //ShareContent shareContent = new ShareContent();
+            //shareContent.SetShareContentCustomize(PlatformType.QQ, content);
+            //ssdk.ShareContent(PlatformType.QQ, shareContent);
+#endif
+		}
+
+		//btnTop += btnHeight + 20 * scale;
+		//if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Share Sina LinkCard"))
+		//{
+		//#if UNITY_IPHONE
+		//ShareContent content = new ShareContent();
+		//content.SetText("sina LinkCard");
+		//content.SetUrl("http://www.mob.com");
+		//content.SetImageUrl("http://www.mob.com/assets/images/ShareSDK_pic_1-09d293a6.png");//必须为网络图片
+		//content.SetSinaLinkCard(true);
+		//content.SetSinaCardTitle("这是Title");
+		//content.SetSinaCardSummary("这是Summary");
+		//content.SetShareType(ContentType.Webpage);
+
+		//ShareContent shareContent = new ShareContent();
+		//shareContent.SetShareContentCustomize(PlatformType.SinaWeibo, content);
+		//ssdk.ShareContent(PlatformType.SinaWeibo, shareContent);
+
+
+		//#elif UNITY_ANDROID
+		//JsonData jsonData = new JsonData();
+		//jsonData["url"] = "http://wx4.sinaimg.cn/large/006WfoFPly1fq0jo9svnaj30dw0dwdhv.jpg";
+		//jsonData["width"] = "120";
+		//jsonData["height"] = "120";
+
+
+		//ShareContent content = new ShareContent();
+		//content.SetText("sina LinkCard");
+		//content.SetSinaCardCreateAtAndroid("2019-01-24");
+		//content.SetSinaCardDisplayNameAndroid("displayName");
+		//content.SetSinaCardSummary("Summary");
+		//content.SetSinaCardURLAndroid("http://www.mob.com/");
+		//content.SetSinaCardTypeAndroid("webpage");
+		//content.SetSinaCardImageAndroid(jsonData);
+		//content.SetEnableClientShare(true);
+
+		//ShareContent shareContent = new ShareContent();
+		//shareContent.SetShareContentCustomize(PlatformType.SinaWeibo, content);
+
+		//ssdk.ShareContent(PlatformType.SinaWeibo, shareContent);
+		//#endif
+		//}
+	}
+	
+	void OnAuthResultHandler(int reqID, ResponseState state, PlatformType type, Hashtable result)
+	{
+		if (state == ResponseState.Success)
+		{
+			if (result != null && result.Count > 0) {
+				print ("authorize success !" + "Platform :" + type + "result:" + MiniJSON.jsonEncode(result));
+			} else {
+				print ("authorize success !" + "Platform :" + type);
+			}
+		}
+		else if (state == ResponseState.Fail)
+		{
+#if UNITY_ANDROID
+			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
+#elif UNITY_IPHONE
+			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
+#endif
+		}
+		else if (state == ResponseState.Cancel) 
+		{
+			print ("cancel !");
+		}
+	}
+	
+	void OnGetUserInfoResultHandler (int reqID, ResponseState state, PlatformType type, Hashtable result)
+	{
+		if (state == ResponseState.Success)
+		{
+			print ("get user info result :");
+			print (MiniJSON.jsonEncode(result));
+            print ("AuthInfo:" + MiniJSON.jsonEncode (ssdk.GetAuthInfo (type)));
+			print ("Get userInfo success !Platform :" + type );
+		}
+		else if (state == ResponseState.Fail)
+		{
+#if UNITY_ANDROID
+			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
+#elif UNITY_IPHONE
+			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
+#endif
+		}
+		else if (state == ResponseState.Cancel) 
+		{
+			print ("cancel !");
+		}
+	}
+	
+	void OnShareResultHandler (int reqID, ResponseState state, PlatformType type, Hashtable result)
+	{
+		if (state == ResponseState.Success)
+		{
+			print ("share successfully - share result :");
+			print (MiniJSON.jsonEncode(result));
+		}
+		else if (state == ResponseState.Fail)
+		{
+#if UNITY_ANDROID
+			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
+#elif UNITY_IPHONE
+			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
+#endif
+		}
+		else if (state == ResponseState.Cancel) 
+		{
+			print ("cancel !");
+		}
+	}
+
+	void OnGetFriendsResultHandler (int reqID, ResponseState state, PlatformType type, Hashtable result)
+	{
+		if (state == ResponseState.Success)
+		{			
+			print ("get friend list result :");
+			print (MiniJSON.jsonEncode(result));
+		}
+		else if (state == ResponseState.Fail)
+		{
+#if UNITY_ANDROID
+			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
+#elif UNITY_IPHONE
+			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
+#endif
+		}
+		else if (state == ResponseState.Cancel) 
+		{
+			print ("cancel !");
+		}
+	}
+
+	void OnFollowFriendResultHandler (int reqID, ResponseState state, PlatformType type, Hashtable result)
+	{
+		if (state == ResponseState.Success)
+		{
+			print ("Follow friend successfully !");
+		}
+		else if (state == ResponseState.Fail)
+		{
+#if UNITY_ANDROID
+			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
+#elif UNITY_IPHONE
+			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
+#endif
+		}
+		else if (state == ResponseState.Cancel) 
+		{
+			print ("cancel !");
+		}
+	}
+
+   void onIsClientValidForAndroid (int reqID, ResponseState state, PlatformType type, Hashtable result)
+   {
+      if (state == ResponseState.Success)
+      {
+         print ("IsClientValidForAndroid successfully !");
+          print ("IsClientValidForAndroid:" + MiniJSON.jsonEncode (MiniJSON.jsonEncode(result)));
+      }
+      else if (state == ResponseState.Fail)
+      {
+         print ("IsClientValidForAndroid Fail !");
+      }
+      else if (state == ResponseState.Cancel)
+      {
+         print ("cancel !");
+      }
+   }
+
+    public static void OnRestoreScene(RestoreSceneInfo scene)
+    {
+        Hashtable customParams = scene.customParams; 
+        if (customParams != null)
+        {
+            Debug.Log("[sharesdk-unity-Demo]OnRestoreScen(). path:" + scene.path.ToString() + ", params:" + scene.customParams.toJson());
+        }
+        else
+        {
+            Debug.Log("[sharesdk-unity-Demo]OnRestoreScen(). path:" + scene.path.ToString() + ", params:null");
+        }
+
+        //根据scene开发者自己处理场景转换
+        //SceneManager.LoadScene("SceneA");
+    }
+
+
+#if UNITY_IPHONE
+
+    public static void GetWXRequestTokenResultHandler(String authcode, sendWXRequestToken send)
+    {
+        Debug.Log("[GetWXRequestTokenResultHandler:" + authcode);
+        send("11", "22");
+    }
+
+    public static void GetWXRefreshTokenResultHandler(String uid, sendWXRefreshToken send)
+    {
+        send("11");
+    }
+#endif
+    //隐私协议回调
+	public static void OnFollowGetPolicy(string url)
+	{
+		Debug.Log("[OnFollowGetPolicy:" + url);
+	}
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ComItem000.cs.meta → GameClient/Assets/Demo/Demo.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d45730ad66d541446a4ec3e02c3d0311
+guid: e94ace64ea93b4d60831774b3bfedaaf
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Editor/ArtsRes/ImagesClip/ImagesClip.cs

@@ -221,6 +221,8 @@ public class ImagesClip : MonoBehaviour
                 writer.Write(resMd5[key]);
             }
             writer.Close();
+            // 稍微延迟关闭文件流
+            System.Threading.Thread.Sleep(100); // 可以根据需要调整延迟时间
         }
     }
     public static Dictionary<string, string> ReadSourceImagesMD5(string saveName)

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -24,7 +24,9 @@ namespace GFGEditor
         public static string ChapterGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/ChapterIcon/";
         public static string ChapterGuideIconMd5FileSaveName = "ChapterGuideIconMd5";
 
-
+        private static string[] StoryGuideIconSrcPaths { get { return new string[] { ResRootPath + "图鉴/故事图鉴" }; } }
+        public static string StoryGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/ChapterIcon/";
+        public static string StoryGuideIconMd5FileSaveName = "StoryGuideIconMd5";
         private static string[] MusicSrcPaths { get { return new string[] { ResRootPath + "music/" }; } }
         public static string MusicTargetPath = $"{ResPathUtil.MUSIC_DIR_PATH}/";
         public static string MusicMd5FileSaveName = "MusicMd5";
@@ -202,6 +204,9 @@ namespace GFGEditor
             //博物图鉴图标
             EditorUtility.DisplayProgressBar("进度", "正在导入博物图鉴图标", 1);
             ImportRes(ChapterGuideIconSrcPaths, ChapterGuideIconTargetPath, ChapterGuideIconMd5FileSaveName);
+            //故事图鉴图标
+            EditorUtility.DisplayProgressBar("进度", "正在导入故事图鉴图标", 1);
+            ImportRes(StoryGuideIconSrcPaths, StoryGuideIconTargetPath, StoryGuideIconMd5FileSaveName);
             //物品图标
             EditorUtility.DisplayProgressBar("进度", "正在导入物品图标", 1);
             ImportRes(ItemIconSrcPaths, ItemIconTargetPath, IconMd5FileSaveName);

GameClient/Assets/Editor/Excel/CodeBuilder.cs

@@ -504,7 +504,8 @@ namespace GFGEditor
                     }
                     if (string.IsNullOrEmpty(_value))
                     {
-                        ET.Log.Error(configArrayName + "  第" + row + "行  " + _type + "   无数值!");
+                        ET.Log.Error(configArrayName + "  第" + row + "行  " + _type + "   无数值!name:" + name + ",id:" +
+                                     worksheet[row, 1].Text.ToString());
                         continue;
                     }
                     if (!_twoDimensionalDic.ContainsKey(_types[1]))

GameClient/Assets/Editor/Excel/ExcelReader.cs

@@ -23,7 +23,7 @@ namespace GFGEditor
             for (int i = 0; i < totalCount; i++)
             {
                 string filePath = files[i];
-                string fileName = Path.GetFileNameWithoutExtension(filePath);
+                string fileName = Path.GetFileNameWithoutExtension(filePath).Trim();
                 if (!fileName.Contains("~") && !fileName.StartsWith(".") && fileName != "")
                 {
                     EditorUtility.DisplayProgressBar("进度", $"fileNmae{fileName}", 1);

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -18,7 +18,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach,GetHeavenApproach ,GetOpenServerFightApproach, GetYuanXiaoGameConsumeApproach, GetYuanXiaoRewardItemApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach,GetHeavenApproach ,GetOpenServerFightApproach, GetYuanXiaoGameConsumeApproach, GetYuanXiaoRewardItemApproach, GetSkillBookSyntheticApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             Dictionary<ItemCfg, List<int>> syntheticSuitDic = new Dictionary<ItemCfg, List<int>>();
             Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic = new Dictionary<SuitCfg, Dictionary<string, string>>();
@@ -458,6 +458,8 @@ namespace GFGEditor
                 {
 
                 }
+                StudioCfg _studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];
+
                 chapterCfg = StoryChapterCfgArray.Instance.GetCfg(cfg.chapterId);
                 studioCfg = StudioCfgArray.Instance.GetCfg(cfg.chapterId);
                 fieldCfg = FieldCfgArray.Instance.GetCfg(cfg.chapterId);
@@ -465,6 +467,16 @@ namespace GFGEditor
                 if (chapterCfg != null || studioCfg != null || fieldCfg != null)
                 {
                     bool result = CheckItemInBonus(itemId, cfg);
+                    if (studioCfg != null)
+                    {
+                        if (cfg.type == 2 && cfg.subType == 4)
+                        {
+                            if (_studioCfg.id != cfg.chapterId)
+                            {
+                                continue;
+                            }
+                        }
+                    }
                     if (result)
                     {
                         string approach = "JU_QING_GUAN_QIA=" + cfg.id;
@@ -871,15 +883,15 @@ namespace GFGEditor
         private static string GetSkillBookSyntheticApproach(int itemId)
         {
             var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if (itemCfg == null)
+            if (itemCfg.itemType == ConstItemType.ITEM && itemCfg.subType == 1 && itemCfg.rarity >= 3)
             {
-                return null;
-            }
-            if (itemCfg.param1Arr.Length <= 0)
-            {
-                return null;
+                ItemExchangeCfg itemExchange = ItemExchangeCfgArray.Instance.GetCfg(itemId);
+                if(itemExchange != null)
+                {
+                    return ConstFunctionId.SKILLBOOK;
+                }
             }
-            return ConstFunctionId.SKILLBOOK;
+            return null;
         }
     }
 }

GameClient/Assets/Editor/ToolsMenu.cs

@@ -34,8 +34,8 @@ namespace GFGEditor
         {
             
         }
-#elif PT_QUICK
-        [MenuItem("QUICK/")]
+#elif PT_DOUYOU
+        [MenuItem("DouYou/")]
         public static void VersionTag()
         {
             

GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -49,5 +49,9 @@ namespace GFGGame
         public const string LUCKY_BOX_LINE = "LUCKY_BOX_LINE";
         public const string BUY_POWER = "BUY_POWER";
 
+        public const string CARD_HECHENG = "CARD_HECHENG";
+        public const string HUALANG_TOUGAO = "HUALANG_TOUGAO";
+        public const string SHEZHI_ZHUJIEMBG = "SHEZHI_ZHUJIEMBG";
+
     }
 }

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -71,6 +71,7 @@ namespace GFGGame
         public const string LOGIN_SUCCESS = "LOGIN_SUCCESS"; //登录成功
         public const string LOGIN_FAIL = "LOGIN_FAIL"; //登录失败
         public const string SERVER_CHANGE = "SERVER_CHANGE"; //更换区服
+        public const string OUT_LOGIN = "OUT_LOGIN"; //退出登录
 
         public const string FIELD_RESULT = "FIELD_RESULT"; //田野结算
         public const string FIELD_TASK = "FIELD_TASK"; //田野任务
@@ -130,6 +131,7 @@ namespace GFGGame
         public const string CONTINUOUS_REBATE_GIFT = "CONTINUOUS_REBATE_GIFT"; //领取连续返利礼包
         public const string CONTINUOUS_REBATE_GIFT_SHOP_BUY = "CONTINUOUS_REBATE_GIFT_SHOP_BUY";
         public const string ACTIVITY_LUCKY_BOX = "ACTIVITY_LUCKY_BOX"; //通知限时抽奖活动剩余次数
+        public const string LUCKY_EFFECT_UPDATE = "LUCKY_EFFECT_UPDATE";
 
         //通知活动移除
         public const string ACTIVITY_REMOVE = "ACTIVITY_REMOVE";
@@ -246,5 +248,13 @@ namespace GFGGame
         public const string TIMETRACINGUPDATE = "TIMETRACING_UPDATE";
         //时光回溯红点更新
         public const string TIMETRACINGREDUPDATE = "TIMETRACING_RED_UPDATE";
+        //章节奖励红点更新
+        public const string STORYCHAPREDUPDATE = "STORYCHAP_RED_UPDATE";
+        //新手领取套装
+        public const string NEWROLEGETSUIT = "NEWROLE_GETSUIT";
+        //搭配学院升级成功
+        public const string COLLEGE_UPGRADE = "COLLEGE_UPGRADE";
+        //兑换成功
+        public const string EXCHANGE_SUCCESS = "EXCHANGE_SUCCESS";
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -140,6 +140,8 @@ namespace GFGGame
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();
             await RoleInfoSProxy.ReqPersonalInfo();
+
+            await CollegeSProxy.ReqCollectUpgradeInfo();
             //功能协议数据不要放这里获取，放在AfterEnterGame函数中
 
             GameGlobal.lastLoginTime = StorageDataManager.Instance.GetStorageValue(ConstStorageId.LAST_LOGIN_TIME);
@@ -195,11 +197,14 @@ namespace GFGGame
                     }
                     else
                     {
-                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId);
-
                         //ViewManager.Show<StoryChapterView>(StudioDataManager.Instance.luckyBoxFilingChapterId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
 
                         ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId);
+                        ////新玩家选择套装
+                        //if (RoleInfoManager.Instance.NewRoleSuitStatus == false)
+                        //{
+                            //ViewManager.Show<NewRoleGetSuitView>();
+                        //}
                     }
                 }
                 GMController.AddShowGMViewEventListener();
@@ -216,6 +221,12 @@ namespace GFGGame
 
             await ShopSProxy.ReqShopInfo();
 
+            await ActivitySProxy.ReqGetNewPlayerBonusStatus();
+            await ActivitySProxy.GetNewPlayerOnceStatus();
+            await ActivitySProxy.GetTipsStatus();
+            await ActivitySProxy.GetOnceStatus(5006);
+            await RoleInfoSProxy.GetThemeID();
+
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;
             bool result = await FieldSProxy.ReqFieldInstanceInfos();
             if (result && FieldDataManager.Instance.fieldInfos.hasBonus)
@@ -229,11 +240,10 @@ namespace GFGGame
             GameGlobal.AfterDataInited = true;
             EventAgent.DispatchEvent(ConstMessage.AFTER_DATA_INITED);
 
-
-
             ItemProxy.GetItemAttributeInfos().Coroutine();
             ItemProxy.ReqGetItemCollect().Coroutine();
             MainStorySProxy.GetStoryBonusInfos().Coroutine();
+            MainStorySProxy.GetStoryBonusDate().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             TaskSProxy.GetTaskInfos();
             BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();     
@@ -245,6 +255,7 @@ namespace GFGGame
             ActivityTeaSProxy.ReqGetNPCVisitInfo().Coroutine();
             ActivitySProxy.ReqActivityZCJBInfo().Coroutine();
             MiniGameProxy.ReqGetChallengeReward().Coroutine();
+            MiniGameProxy.ReqGetActivityGameInfos(5003).Coroutine();
 
             TimeTracingDataManager.Instance.InitRewardDic();
             TimeTracingSProxy.ReqGetLevelRewardStatus().Coroutine();
@@ -267,6 +278,9 @@ namespace GFGGame
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
             ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
+            ShopSProxy.ReqGetGrowthFundInfo().Coroutine();
+            ActivityAfuGiftSProxy.GetSummerGiftInfo().Coroutine();
+            //RoleInfoSProxy.ReqNewRoleGetSuitStatus().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;
@@ -284,12 +298,28 @@ namespace GFGGame
 
         public static void QuitToLoginView(bool logout, bool fromSdkLogoutCallback = false)
         {
+            switch (LauncherConfig.ChannelId)
+            {
+                case (int)ChannelID.DouYou:
+                    QDDouYouManager.Instance.LoginOutBefore();
+                    break;
+                case (int)ChannelID.DouYouDev:
+                    QDDouYouManager.Instance.LoginOutBefore();
+                    break;
+                default:
+                    break;
+            }
+
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;
             GameGlobal.AutoSevenDayLoginView = true;
             GameGlobal.AutoDailySignView = true;
             GameGlobal.AutoSpecialOfferGiftBoxView = true;
             GameGlobal.AutoAcitivtyTipsLoginView = true;
             GameGlobal.AutoMonthlyCardView = true;
+            GameGlobal.AutoZGTHDCTips = true;
+            GameGlobal.AutoZGTHTips = true;
+            GameGlobal.AutoPearRebateTips = true;
+            GameGlobal.AutoZCJBTips = true;
             GameGlobal.AutoShowCompleted = false;
             GameGlobal.PreDataInited = false;
             GameGlobal.AfterDataInited = false;
@@ -341,7 +371,7 @@ namespace GFGGame
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
             if (logout)
             {
-                    QDManager.Logout(fromSdkLogoutCallback);
+                    QDManager.Logout();
             }
             ViewManager.Hide<GuideView>();
             if(!ViewManager.isViewOpen(typeof(LoginView).FullName))

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -63,7 +63,7 @@ namespace GFGGame
 
         }
         private static GList targetList = null;
-        public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false, bool noTips = false)
+        public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false, bool noTips = false,bool otherChapterID = false)
         {
             if (!GameGlobal.PreDataInited)
             {
@@ -89,7 +89,9 @@ namespace GFGGame
             bool isFinishPriorIndex = !checkPriorIndex || checkPriorIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true;//前置index已完成
             // ET.Log.Debug("storyLevelId:" + cfg.storyLevelId + "    time:" + TimeHelper.ClientNowSeconds());
             bool isCfgChapterOpen = MainStoryDataManager.CheckLevelUnlock(cfg.storyLevelId, false);//引导配置关卡已开启
-            bool isCfgChapter = MainStoryDataManager.currentLevelCfgId == 0 || MainStoryDataManager.currentLevelCfgId == cfg.storyLevelId;//无选择（进入游戏时无选择）或当前所选择为配置关卡
+            bool isCfgChapter = MainStoryDataManager.currentLevelCfgId == 0 
+                || otherChapterID
+                || MainStoryDataManager.currentLevelCfgId == cfg.storyLevelId;//无选择（进入游戏时无选择）或当前所选择为配置关卡
 
             if (isStoryLevelGuide && isPass && !isFinishCurId)
             {

GameClient/Assets/Game/HotUpdate/Controller/MainController.cs

@@ -18,10 +18,19 @@ namespace GFGGame
                 StoryChapterCfg chapterCfg = _chapterCfgs[i];
                 if (i == _chapterCfgs.Count - 1 && MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
-                    MainStoryDataManager.currentChapterCfgId = chapterCfg.id;
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
-                    isOpen = false;
-                    return isOpen;
+                    if (StoryController.CheckSuitGot(_chapterCfgs[i-1].suitId))
+                    {
+                        MainStoryDataManager.currentChapterCfgId = chapterCfg.id;
+                        ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
+                        isOpen = false;
+                        return isOpen;
+                    }
+                    else
+                    {
+                        ViewManager.Show<StoryChapterListView>(new object[] { 0, Mathf.Max(0, chapterCfg.order - 1) });
+                        isOpen = false;
+                        return isOpen;
+                    }
                 }
                 else if (!MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {

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

@@ -21,6 +21,15 @@ namespace GFGGame
         private List<ActivityLoginCfg> _rewardCfgs;
         public List<ActivityLoginCfg> RewardCfgs { get => _rewardCfgs; set => _rewardCfgs = value; }
 
+        //消暑礼包
+        public int SummerActivityID = 3003;
+        public bool IsSummerGiftBuy = false;
+        public Dictionary<int, List<int>> SummerGiftRewardState = new Dictionary<int, List<int>>()
+        {
+            [0] = new List<int>(),
+            [1] = new List<int>()
+        };
+
         private bool _isOpen;
         public bool IsOpen { get => _isOpen; set => _isOpen = value; }
 
@@ -113,5 +122,26 @@ namespace GFGGame
             //_normalRewards.Clear();
             //_superRewards.Clear();
         }
+
+        public bool GetSummerGiftRewardAllState()
+        {
+            long curTime = TimeHelper.ServerNow();
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(SummerActivityID);
+            if (activityInfo == null)
+            {
+                return false;
+            }
+            foreach (var item in SummerGiftRewardState)
+            {
+                foreach(var state in item.Value)
+                {
+                    if(state == 1)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -1,3 +1,4 @@
+using ET;
 using System.Collections.Generic;
 
 namespace GFGGame
@@ -38,6 +39,8 @@ namespace GFGGame
         /**********************************************************限时累充*************************************************/
         public int lastActLimitChargeId = 0;
         private int _actLimitChargeId = 0;
+        /**********************************************************限时累充*************************************************/
+        public bool IsGetNewPlayerReward = false;
         /// <summary>
         /// 当前限时累充活动id
         /// </summary>
@@ -210,6 +213,46 @@ namespace GFGGame
             }
             return true;
         }
+
+        public bool HaveGetSevenDayBonus()
+        {
+            foreach (int a in sevenDayLoginBonusStatusList)
+            {
+                if (a == 0) return true;
+            }
+            return false;
+        }
+        //判断最后可领取的奖励索引
+        public int NowSevenDayBonusDay(bool day = false)
+        {
+            if(AllSevenDayBonusGot())
+            {
+                return 8;
+            }
+            int a = 0;
+            int flog = -1;
+            if (day)
+            {
+                for (int j = 0; j < sevenDayLoginBonusStatusList.Count; j++)
+                {
+                    a = sevenDayLoginBonusStatusList[j];
+                    if (a == 1)
+                    {
+                        flog = j;
+                        return flog;
+                    }
+                }
+            }
+            else
+            {
+                for (int j = 0; j < sevenDayLoginBonusStatusList.Count; j++)
+                {
+                    a = sevenDayLoginBonusStatusList[j];
+                    if (a == 2) flog = j;
+                }
+            }
+            return flog;
+        }
         /******************************************************************************************************************/
 
         private int _firstChargeBonusStatus = 0;
@@ -237,11 +280,12 @@ namespace GFGGame
 
         //招财进宝活动
         public List<int> ActivityZCJBList = new List<int>();
+        public int activityZCJBId = 61101;
         public bool CheckZCJBRed()
         {
             ItemData numItem;
             long num;
-            if(BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            if(BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -271,9 +315,92 @@ namespace GFGGame
         public Dictionary<int,int> NewYearLoginInfoDic = new Dictionary<int, int>();
         public bool CanGetNewYearLoginRed()
         {
-            foreach (var a in NewYearLoginInfoDic)
+            //foreach (var a in NewYearLoginInfoDic)
+            //{
+            //    if (a.Value == 1) return true;
+            //}
+            return false;
+        }
+
+        //返回直购时间内打折扣的套装id
+        private int GetCheckDiscountSuitId()
+        {
+            return 0;
+        }
+        public Dictionary<long, long> TipsStatusDic = new Dictionary<long, long>();
+        //珍珠赠礼是否弹窗
+        public bool CheckPearRebateTips(int id)
+        {
+            bool flog = true;
+            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(id);   
+            for(int i =0;i< activityCfg.paramsArr.Length;i++)
+            {
+                ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(activityCfg.paramsArr[i]);
+                int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+                if (shopCfg.maxBuyNum == 0 || buyNum < shopCfg.maxBuyNum)
+                {
+                    flog = false;
+                    
+                }
+            }
+            if(!flog)
+            {
+                if (ActivityGlobalDataManager.Instance.IsActivityOpen(id))
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                return false;
+            }
+
+        }
+
+        //根据创角时间判断活动是否开启
+        public bool CheckActivityByRoleTime(int id)
+        {
+           return ActivityGlobalDataManager.Instance.IsActivityOpen(id);
+            //ActivityOpenCfg item = ActivityOpenCfgArray.Instance.GetCfg(id);
+            //if (item == null || item.CreatTime == 0)
+            //{
+            //    return false;
+            //}
+            ////创角时间
+            //long time = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
+            //long laterTime = (TimeHelper.ServerNow() - time) / 1000 / 60;
+            //if (laterTime >= item.CreatTime && laterTime < (item.CreatTime + item.OpenLastTime))
+            //{
+            //    return true;
+            //}
+            //return false;
+        }
+        public long GetActivityTime(int id)
+        {
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(id);
+            int endTime = (_activityCfg.AfterCreatRoleTime * 24 * 60) + _activityCfg.OpenLastTime;
+            endTime = endTime * 60;
+            long time = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
+            long laterTime = (TimeHelper.ServerNow() - time)/1000;
+            long curTime = (endTime - laterTime)* 1000;
+            return curTime;
+        }
+        public bool isExtendTime(int day)
+        {
+            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
+            long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
+            long ExtendTime = (day * 24 * 60 * 60 * 1000);
+            long currentTime = TimeHelper.ServerNow();
+            if(currentTime > endTime)
             {
-                if (a.Value == 1) return true;
+                if((currentTime - endTime) <= ExtendTime)
+                {
+                    return true;
+                }
             }
             return false;
         }

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

@@ -27,6 +27,7 @@ namespace GFGGame
 
         public List<ArenaHistoryData> HistoryDatas = new List<ArenaHistoryData>(); //获取竞技场历史记录
 
+        public Dictionary<int,int> GradeRewardStateDic = new Dictionary<int, int>(); //段位奖励数据
         /*************************************************************************************************************************************/
         // public Dictionary<int, Texture2D> TextureDic = new Dictionary<int, Texture2D>();
         public List<int> roundTime = new List<int>();

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

@@ -0,0 +1,255 @@
+using ET;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.Text.RegularExpressions;
+
+namespace GFGGame
+{
+    public class CollectPartDataManager : SingletonBase<CollectPartDataManager>
+    {
+        //部位数量
+        public const int Count = 8;
+        //普通最高段位
+        public int MaxNormalRank = 5;
+        //特殊最高段位
+        public int MaxSpecialRank = 3;
+        //最高等级
+        public int MaxLevel = 9;
+        //加成比值
+        public int AddtitionRatio = 100;
+        //搭配部位分类
+        public Dictionary<int, List<float>> partScoreListDic = new Dictionary<int, List<float>>();
+        //部位名
+        public Dictionary<int, string> partNameDic = new Dictionary<int, string>() 
+        {    [1] = "连衣裙或上下装及内搭",
+             [2] = "发型",
+             [3] = "外套",
+             [4] = "袜子",
+             [5] = "鞋子",
+             [6] = "饰品",
+             [7] = "手持物",
+             [99] = "所有",
+              };
+        //部位图片
+        public Dictionary<int, string> partImage = new Dictionary<int, string>
+        {
+            [1] = "part1",
+            [2] = "hz_fenleitu_1",
+            [3] = "hz_fenleitu_12",
+            [4] = "hz_fenleitu_7",
+            [5] = "hz_fenleitu_8",
+            [6] = "hz_fenleitu_9",
+            [7] = "hz_fenleitu_10",
+            [99] = "part99",
+        };
+        //数据
+        public Dictionary<int, List<int>> CollectPartDataDic = new Dictionary<int, List<int>>();
+
+        //临时数据，后续通过服务器获取
+        public void UpdateDic()
+        {
+            CollectPartDataDic.Clear();
+            CollegeBoostCfg collectcfg;
+            for (int i = 1; i <= Count; i++)
+            {
+                List<int> item = new List<int>() { 3, 9 };
+                if (i == Count)
+                {
+                    collectcfg = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(99, item[0], item[1]);
+                    if (collectcfg == null)
+                    {
+                        item.Add(0);
+                    }
+                    else
+                    {
+                        item.Add(collectcfg.value);
+                    }
+                    if (CollectPartDataDic.ContainsKey(99))
+                    {
+                        CollectPartDataDic[99] = item;
+                    }
+                    else
+                    {
+                        CollectPartDataDic.Add(99, item);
+                    }
+                }
+                else
+                {
+                    collectcfg = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(i, item[0], item[1]);
+                    if (collectcfg == null)
+                    {
+                        item.Add(0);
+                    }
+                    else
+                    {
+                        item.Add(collectcfg.value);
+                    }
+                    if (CollectPartDataDic.ContainsKey(i))
+                    {
+                        CollectPartDataDic[i] = item;
+                    }
+                    else
+                    {
+                        CollectPartDataDic.Add(i, item);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 穿戴部件的搭配加成
+        /// </summary>
+        public float GetEquipScoresWithPartId(int itemID)
+        {
+            CollegeSubTypesCfg[] typeCfgs = CollegeSubTypesCfgArray.Instance.dataArray;
+            float addNum = 0;
+            for (int j = 0; j < typeCfgs.Length; j++)
+            {
+                CollegeSubTypesCfg cfg = typeCfgs[j];
+                for (int k = 0; k < cfg.subTypesArr.Length; k++)
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
+                    if (itemCfg.subType == cfg.subTypesArr[k])
+                    {
+                        int partIndex = cfg.AdditionSite;
+                        int partIndexCommon = 0;
+                        partIndexCommon = partIndex;
+                        int level = CollectPartDataDic[partIndex][0];
+                        int levelNum = CollectPartDataDic[partIndex][1];
+                        if(levelNum == 0)
+                        {
+                            addNum += 0;
+                            break;
+                        }
+                        CollegeBoostCfg collegeCfg = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(partIndex, level, levelNum);
+                        addNum += (float)collegeCfg.value / 10000;
+                        break;
+                    }
+                }
+            }
+            return addNum + 1;
+        }
+        //判断部分是否可以升级
+        public bool CheckPartCanUP(int pardId)
+        {
+            int rankIndex = CollectPartDataDic[pardId][0];
+            int rankLv = CollectPartDataDic[pardId][1];
+            if (rankLv + 1 > CollectPartDataManager.Instance.MaxLevel)
+            {
+                rankIndex += 1;
+                rankLv = 1;
+            }
+            else
+            {
+                rankLv += 1;
+            }
+            CollegeBoostCfg collegeBoostCfg = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(pardId,rankIndex,rankLv);
+            if (collegeBoostCfg == null)
+            {
+                return false;
+            }
+            for (int i = 0; i < collegeBoostCfg.consumeArr.Length; i++)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(collegeBoostCfg.consumeArr[i][0]);
+                ItemData itemCount;
+                long count;
+                if (itemCfg.itemType == ConstItemType.DRESS_UP)
+                {
+                    count = ItemDataManager.GetItemNum(collegeBoostCfg.consumeArr[i][0]);
+                }
+                else
+                {
+                    if (BagDataManager.Instance.GetBagData().TryGetValue(collegeBoostCfg.consumeArr[i][0], out itemCount))
+                    {
+                        count = itemCount.num;
+                    }
+                    else
+                    {
+                        count = 0;
+                    }
+                }
+                if(count < collegeBoostCfg.consumeArr[i][1])
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+        //判断所有已开启部位是否可以升级
+        public bool CheckAllOpenPartCanUP()
+        {
+            if(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingSelectView).Name, false))
+            {
+                return false;
+            }
+            foreach(var item in CollectPartDataDic)
+            {
+                if(IsOpenRank(item.Key))
+                {
+                    if(CheckPartCanUP(item.Key))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        public bool IsOpenRank(int partIndex, int levelNum = 9)
+        {
+            List<int> openList;
+            bool isRank = false;
+            bool isLevel = false;
+            bool isPassStory = false;
+            CollegeRankOpenCfg openitem = CollegeRankOpenCfgArray.Instance.GetCfg(partIndex);
+            openList = GetOpenList(partIndex);
+            //判断段位
+            if (openitem.OpenPreconditionArr == null || openitem.OpenPreconditionArr.Length == 0)
+            {
+                isRank = true;
+            }
+            else
+            {
+                if (CollectPartDataDic[openList[0]][0] >= openList[1])
+                {
+                    if (CollectPartDataDic[openList[0]][1] >= openList[2])
+                    {
+                        isRank = true;
+                    }
+                }
+            }
+            //判断等级
+            if (RoleDataManager.lvl >= openitem.needRoleLv)
+            {
+                isLevel = true;
+            }
+            //判断关卡
+            if (openitem.needStoryLevelId == 0 || InstanceZonesDataManager.CheckLevelPass(openitem.needStoryLevelId))
+            {
+                isPassStory = true;
+            }
+            else
+            {
+                isPassStory = false;
+            }
+
+            return isRank && isLevel && isPassStory;
+        }
+        public List<int> GetOpenList(int partIndex)
+        {
+            List<int> openList = new List<int>();
+            string pattern = @"\d+";
+            CollegeRankOpenCfg openitem = CollegeRankOpenCfgArray.Instance.GetCfg(partIndex);
+            for (int i = 0; i < openitem.OpenPreconditionArr.Length; i++)
+            {
+                MatchCollection matches = Regex.Matches(openitem.OpenPreconditionArr[i], pattern);
+                foreach (Match match in matches)
+                {
+                    openList.Add(int.Parse(match.Value));
+                }
+            }
+            return openList;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBack0.cs.meta → GameClient/Assets/Game/HotUpdate/Data/CollectPartDataManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d055b393d18a66d4c998ef80dc39e70f
+guid: 2c66ee290f63a5d4caa164ef84dadc7f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -220,6 +220,10 @@ namespace GFGGame
         {
             int sum = 0;
             int skillId = ItemDataManager.GetItemSkillId(itemId);
+            if(skillId == 0)
+            {
+                return 0;
+            }
             Dictionary<int, int> leagueSkillLvDatas = SkillDataManager.Instance.GetLeagueSkillLvDatas();
             if (!leagueSkillLvDatas.ContainsKey(skillId))
                 return 0;

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

@@ -29,6 +29,8 @@ namespace GFGGame
 
         private static Dictionary<int, int> _suitSyntheticBoxBonusStatus = new Dictionary<int, int>();
 
+        public static Dictionary<int, int> _suitSyntheticRewardStatus = new Dictionary<int, int>();
+
         public static void InitData()
         {
             _suitIDList.Clear();
@@ -43,6 +45,7 @@ namespace GFGGame
             {
                 _suitGuideBoxBonusStatus.Clear();
                 _suitSyntheticBoxBonusStatus.Clear();
+                _suitSyntheticRewardStatus.Clear();
                 foreach (SuitInfoProto suitInfo in suitInfoList)
                 {
                     SuitFosterData suitFosterData = new SuitFosterData()
@@ -58,6 +61,9 @@ namespace GFGGame
                     _suitGuideBoxBonusStatus.Add(suitInfo.SuitId, suitInfo.GuideBoxBonusState);
                     //合成
                     _suitSyntheticBoxBonusStatus.Add(suitInfo.SuitId, suitInfo.SyntheticBoxBonusState);
+                    //套装合成奖励2
+                    _suitSyntheticRewardStatus.Add(suitInfo.SuitId,suitInfo.BringTogetherRewardStatus);
+
                     _progressBySuitIdDic[suitInfo.SuitId] = suitInfo.PartsCount;
                     if (suitInfo.CollectedAll)
                     {
@@ -239,7 +245,30 @@ namespace GFGGame
             _suitSyntheticBoxBonusStatus[suitId] = ConstBonusStatus.GOT;
             EventAgent.DispatchEvent(ConstMessage.SUIT_BOX_STATUS_CHANGED, suitId);
         }
-
+        //套装集齐奖励2
+        public static void SetSuitSyntheticRewardStatus(int suitId)
+        {
+            if(_suitSyntheticRewardStatus.ContainsKey(suitId))
+            {
+                _suitSyntheticRewardStatus[suitId] = ConstBonusStatus.GOT;
+            }
+        }
+        public static int GetSuitSyntheticRewardStatus(int suitId)
+        {
+            int status = ConstBonusStatus.CAN_NOT_GET;
+            if (_suitSyntheticRewardStatus.ContainsKey(suitId))
+            {
+                status = _suitSyntheticRewardStatus[suitId];
+            }
+            if (status == ConstBonusStatus.CAN_NOT_GET)
+            {
+                if (CheckHaveSuit(suitId))
+                {
+                    status = ConstBonusStatus.CAN_GET;
+                }
+            }
+            return status;
+        }
         //检查套装是否有动作资源
         public static bool CheckSuitHasActionRes(int suitId)
         {

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

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using FairyGUI;
+
+namespace GFGGame
+{
+    //用于引导的模拟数据
+    public class GuideSimulationDataManager : SingletonBase<GuideSimulationDataManager>
+    {
+        //引导背景特权
+        //1:从商店进入
+        //2:从设置进入
+        public int GuideMonthlyJumpType = 0;
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/GuideSimulationDataManager.cs.meta

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

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

@@ -400,7 +400,15 @@ namespace GFGGame
             {
                 var activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(levelCfg.chapterId);
                 RoleLimitData limitData = RoleLimitDataManager.GetLimitData(activityFightCfg.limit);
-                times = limitData.TotalPlayMax - limitData.PlayTimes;
+                int time = limitData.TotalPlayMax - limitData.PlayTimes;
+                times = Math.Min(times, time);
+            }
+            else if(type == 1 && subType == 1)
+            {
+                //精英关卡特殊处理
+                RoleLimitData limitData = RoleLimitDataManager.GetLimitData(50);
+                int time = limitData.TotalPlayMax - limitData.PlayTimes;
+                times = Math.Min(times, time);
             }
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
         }

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

@@ -191,6 +191,10 @@ namespace GFGGame
                 return value.param2Arr[0];
             }
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (itemCfg.param2Arr.Length == 0)
+            {
+                return 0;
+            }
             return itemCfg.param2Arr[0];
         }
 

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

@@ -197,20 +197,20 @@ namespace GFGGame
                 bool isGet = false;
                 switch (welfareCfg.type)
                 {
-                    case LeagueWelfareType.Day:
-                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareDay) == 1;
+                    case LeagueWelfareType.Day: //普通日福利
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareDay) > 0;
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareDay) == 1;
                         break;
-                    case LeagueWelfareType.Week:
-                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareWeek) == 1;
+                    case LeagueWelfareType.Week: //普通周福利
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareWeekLeftTimes) > 0;
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareWeek) == 1;
                         break;
-                    case LeagueWelfareType.SuperWeek:
-                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperWeek) == 1;
+                    case LeagueWelfareType.SuperWeek: //超级周福利
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperLeftTimes) > 0;
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareSuperWeek) == 1;
                         break;
-                    case LeagueWelfareType.SuperDay:
-                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperDay) == 1;
+                    case LeagueWelfareType.SuperDay: //超级日福利
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperDay) > 0;
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareSuperDay) == 1;
                         break;
                 }
@@ -242,11 +242,11 @@ namespace GFGGame
                         buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareDay);
                         break;
                     case LeagueWelfareType.Week:
-                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareWeek);
+                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareWeekLeftTimes) > 0 ? 1 : 0;
                         endTime = GetNumeriValue(LeagueNumericType.LeagueWelfareWeekLeftTimes);
                         break;
                     case LeagueWelfareType.SuperWeek:
-                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareSuperWeek);
+                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareSuperLeftTimes) > 0 ? 1 : 0;
                         endTime = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperLeftTimes);
                         break;
                     case LeagueWelfareType.SuperDay:

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

@@ -52,5 +52,23 @@ namespace GFGGame
                 _needUpdateProxyData = value;
             }
         }
+        /// <summary>
+        /// 收纳状态，0：已收纳，1：二级界面
+        /// </summary>
+        private int _StorageStatus = 0;
+        public int StorageStatus
+        {
+            get
+            {
+                return _StorageStatus;
+            }
+            set
+            {
+                _StorageStatus = value;
+            }
+        }
+
+        public int CardBgID = 0;
+        public int CardBgKey = 200000;
     }
 }

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

@@ -109,6 +109,27 @@ namespace GFGGame
             }
             return true;
         }
+        public static int CheckChapterPassIndex(int subtype)
+        {
+            int count = 2;
+            List<StoryChapterCfg> chapList = StoryChapterCfgArray.Instance.GetCfgsBysubType(subtype);
+            foreach (StoryChapterCfg item in chapList)
+            {
+                var preChapterCfg = StoryChapterCfgArray.Instance.GetCfg(item.id);
+                if (preChapterCfg != null)
+                {
+                    if(InstanceZonesDataManager.CheckChapterPass(preChapterCfg.type, preChapterCfg.subType, preChapterCfg.id, preChapterCfg.levelCount))
+                    {
+                        count++;
+                    }
+                }
+            }
+            if(count> chapList.Count)
+            {
+                count = chapList.Count;
+            }
+            return count;
+        }
 
         public static bool CheckChapterUnlock(int chapterId, bool checkRoleLv = true)
         {
@@ -168,5 +189,26 @@ namespace GFGGame
             return ConstInstanceZonesSubType.Normal;
         }
 
+        //章节奖励状态
+        public static Dictionary<int, int> ChapterRewardStatusDic = new Dictionary<int, int>();
+
+        public static bool GetChapterRewardStatus()
+        {
+            foreach(var item in ChapterRewardStatusDic)
+            {
+                StoryChapterCfg chapterRewardCfg = StoryChapterCfgArray.Instance.GetCfg(item.Key);
+                if(chapterRewardCfg.type == 1 && chapterRewardCfg.subType == 1)
+                {
+                    continue;
+                }
+                if(item.Value == 1)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //关卡当前难度类型
+        public static int currentChapterType = 0;
     }
 }

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

@@ -138,6 +138,25 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 判断所有章节是否有奖励可领
+        /// </summary>
+        /// <returns></returns>
+        public bool GetChapterRed()
+        {
+            for (int i = 0; i < StoryChapterCfgArray.Instance.dataArray.Length; i++)
+            {
+                for (int j = 0; j < 3; j++)
+                {
+                    int state = MainStoryDataManager.GetChapterBonusStatus(StoryChapterCfgArray.Instance.dataArray[i].id, j);
+                    if (state == ConstBonusStatus.CAN_GET)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        /// <summary>
         /// 根据章节Id判断是否有奖励可领
         /// </summary>
         /// <returns></returns>
@@ -319,7 +338,7 @@ namespace GFGGame
         public bool GetCardRed(int cardId)
         {
             // GetCardUpStarRed(cardId) || GetCardUpLvRed(cardId) ||
-            return GetCardStarReward(cardId) || GetCardSkillsRed(cardId) ;
+            return GetCardStarReward(cardId) || GetCardSkillsRed(cardId) || CheckCardCanSynthetic(cardId);
         }
 
         /// <summary>
@@ -515,7 +534,7 @@ namespace GFGGame
             List<SuitCfg> suitCfgs = SuitCfgArray.Instance.GetCfgsBysyntheticType(tab);
             for (int i = 0; i < suitCfgs.Count; i++)
             {
-                if (GetClothingSyntheticBonusRed(suitCfgs[i].id)) return true;
+                if (GetClothingSyntheticBonusRed(suitCfgs[i].id) || GetClothingSyntheticRewardRed(suitCfgs[i].id)) return true;
                 bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitCfgs[i].syntheticStoryLevelId);
                 if (!isLevelPass) continue;
                 if (GetClothingSyntheticRed(suitCfgs[i].id)) return true;
@@ -571,6 +590,36 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 套装合成奖励2红点
+        /// </summary>
+        /// <param name="suitId"></param>
+        /// <returns></returns>
+        public bool GetClothingSyntheticRewardRed(int suitId)
+        {
+            bool isLock = false;
+            int status = DressUpMenuSuitDataManager.GetSuitSyntheticRewardStatus(suitId);
+
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            if (suitCfg.syntheticStoryLevelId > 0)
+            {
+                bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
+                if (!isLevelPass)
+                {
+                    isLock = true;
+                }
+            }
+            if (suitCfg.syntheticPreSuitId > 0)
+            {
+                bool hasPreSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitCfg.syntheticPreSuitId);
+                if (!hasPreSuit)
+                {
+                    isLock = true;
+                }
+            }
+            return status == ConstBonusStatus.CAN_GET && !isLock;
+        }
+
+        /// <summary>
         /// 合成-服装部件红点
         /// </summary>
         /// <param name="itemId"></param>
@@ -598,14 +647,51 @@ namespace GFGGame
             }
             return true;
         }
-
+        /// <summary>
+        /// 卡牌合成红点
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <param name="showTips"></param>
+        /// <returns></returns>
+        public int count = 0;
+        public bool CheckCardCanSynthetic(int itemId)
+        {
+            GetCardTimers(itemId).Coroutine();
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if(count >= itemCfg.syntheticTimes)
+            {
+                return false;
+            }
+            if (itemCfg == null || ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum || itemCfg.syntheticTimes <= 0)
+            {
+                return false;
+            }
+            List<ItemData> materiarsOfSelectedItem = ItemUtil.CreateItemDataList(itemCfg.syntheticMateriarsArr);
+            for (int i = 0; i < materiarsOfSelectedItem.Count; i++)
+            {
+                ItemData itemData = materiarsOfSelectedItem[i];
+                long numSynthetic = ItemDataManager.GetItemNum(itemData.id);
+                if (numSynthetic < itemData.num)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+        public async ETTask<bool> GetCardTimers(int itemId)
+        {
+            //合成材料判断
+            var response = await ClothingSyntheticSProxy.GetCardSyntheticCount(itemId);
+            count = response;
+            return true;
+        }
         /// <summary>
         /// 商城
         /// </summary>
         /// <returns></returns>
         public bool GetShopRed()
         {
-            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed() || GetGrowthFundRewardRed();
+            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed() || GetGrowthFundRewardRed() || ActivityAfuGiftDataManager.Instance.GetSummerGiftRewardAllState();
         }
         //商店-充值-会员中心
         public bool GetChargeAddUpRewardRed()
@@ -655,7 +741,18 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetGrowthFundBuy()
         {
-            return GameGlobal.myNumericComponent.GetAsInt(NumericType.BuyGrowthFund) == 0;
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(ActivityOpenCfgArray.Instance.GetCfg(3002).paramsArr[0]);
+            var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+            if (remainBuyNum == 0)
+            {
+                //已售完
+                return true;
+            }
+            else
+            {
+                //未售完
+                return false;
+            }
         }
 
         public bool GetGrowthFundRewardRed()
@@ -664,7 +761,7 @@ namespace GFGGame
             {
                 return false;
             }
-            if (GetGrowthFundBuy())
+            if (!GetGrowthFundBuy())
             {
                 return false;
             }
@@ -679,6 +776,10 @@ namespace GFGGame
                     }
                 }
             }
+            if(RoleDataManager.lvl >= GrowthFundCfgArray.Instance.dataArray[GrowthFundCfgArray.Instance.dataArray.Length-1].level)
+            {
+                return true;
+            }
             return false;
         }
 

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

@@ -126,7 +126,11 @@ namespace GFGGame
         {
             get
             {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+                if(GameGlobal.myNumericComponent != null)
+                {
+                    return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+                }
+                return 1;
             }
         }
 
@@ -149,8 +153,11 @@ namespace GFGGame
         {
             get
             {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipLevel);
-
+                if(GameGlobal.myNumericComponent != null)
+                {
+                    return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipLevel);
+                }
+                return 0;
             }
         }
         public static int vipExp

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

@@ -33,7 +33,7 @@ namespace GFGGame
                 return _headBorderDatas;
             }
         }
-
+        public bool NewRoleSuitStatus;
         public void Add(ItemInfoProto itemInfoProto)
         {
             var itemId = itemInfoProto.ConfigId;

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

@@ -144,7 +144,36 @@ namespace GFGGame
             int score = (int)Math.Ceiling(partScore + clickScore );
             return Math.Max(0, score);
         }
+        /// <summary>
+        /// 根据搭配学院获得服装分类基础分加成
+        /// CollectPartDataManager.partIndex: 1.连衣裙或者上衣、下装及内搭 2.发型 3.外套4.袜子 5.鞋子6.饰品7.手持物
+        /// </summary>
+        public float CollegeAddition(int roundId)
+        {
+            int additionNum = 1;
 
+            switch (roundId)
+            {
+                case 1:
+                    additionNum += CollectPartDataManager.Instance.CollectPartDataDic[2][2]/10000;
+                    break;
+                case 2:
+                    break;
+                case 3:
+                    additionNum += CollectPartDataManager.Instance.CollectPartDataDic[6][2] / 10000;
+                    break;
+                case 4:
+                    additionNum += CollectPartDataManager.Instance.CollectPartDataDic[7][2] / 10000;
+                    break;
+                case 5:
+                    additionNum += CollectPartDataManager.Instance.CollectPartDataDic[4][2] / 10000 + CollectPartDataManager.Instance.CollectPartDataDic[5][2] / 10000;
+                    break;
+                case 6:
+                    additionNum += CollectPartDataManager.Instance.CollectPartDataDic[1][2] / 10000 + CollectPartDataManager.Instance.CollectPartDataDic[3][2] / 10000;
+                    break;
+            }
+            return additionNum;
+        }
         public int GetRobotRoundScore(FightData robotData, int roundId, int clickType, double skillScore)
         {
             //部件评分=部件基础分*部件系数

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

@@ -0,0 +1,76 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using ET;
+using FairyGUI;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class ShareDataManager : SingletonBase<ShareDataManager>
+    {
+        //当前分享
+        public byte[] imageBytes;
+        public string outputImagePath; // 输出图片的路径
+        public GGroup group;
+        public void ShareImage(string imageUrl)
+        {
+            // 使用ShareSDK或其他分享插件来分享图片URL
+            // 这里需要根据具体插件的API来实现分享功能
+        }
+        //isJump:是否跳转
+        //isCapture：是否截图
+        public void CaptureCameraToImage(bool isJump = true,bool isCapture = true)
+        {
+            Timers.inst.StartCoroutine(CaptureCameraImage(isJump,isCapture));
+        }
+        private IEnumerator CaptureCameraImage(bool isJump = true, bool isCapture = true)
+        {
+            if (!isJump)
+            {
+                group.visible = false;
+            }
+            yield return new WaitForEndOfFrame();
+            SetImageTargetPath();
+            if (isCapture)
+            {
+                Rect rect = new Rect(0, 0, UnityEngine.Screen.width, UnityEngine.Screen.height);
+                Texture2D tex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.ARGB32, false);//新建一个Texture2D对象
+                tex.ReadPixels(rect, 0, 0);//读取像素，屏幕左下角为0点
+                tex.Apply();//保存像素信息
+
+                // 将Texture2D保存为图片
+                imageBytes = tex.EncodeToPNG();
+            }
+            // 保存到磁盘
+            File.WriteAllBytes(outputImagePath, imageBytes);
+            Debug.Log("Camera capture saved to " + outputImagePath);
+            if (!isJump)
+            {
+                group.visible = true;
+            }
+            if (isJump)
+            {
+                ViewManager.Show<ShareView>();
+            }
+        }
+
+        public Texture2D ConvertBytesToTexture(byte[] imageBytes)
+        {
+            // 创建一个新的Texture2D对象
+            Texture2D texture = new Texture2D(UnityEngine.Screen.width, UnityEngine.Screen.height); // 宽度和高度需要根据图片实际尺寸来设置
+            texture.LoadImage(imageBytes); // 加载图片数据
+
+            // 应用纹理设置
+            texture.Apply();
+
+            return texture;
+        }
+
+        private void SetImageTargetPath()
+        {
+            outputImagePath = Application.persistentDataPath + "/share.png";
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/ShareDataManager.cs.meta

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

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

@@ -120,6 +120,18 @@ namespace GFGGame
             }
             return shopCfgs;
         }
+
+        //移除原价商品
+        public List<ShopCfg> RemoveNotSaleCfg(List<ShopCfg> shop,List<int> idList)
+        {
+            List<ShopCfg> shopCfgs = new List<ShopCfg>();
+            for (int i = 0; i < idList.Count; i++)
+            {
+                ShopCfg shopcfg = ShopCfgArray.Instance.GetCfg(idList[i]);
+                shopCfgs.Add(shopcfg);
+            }
+            return shopCfgs;
+        }
         //商品排序
         public List<ShopCfg> SortShopGoodsCfgs(List<ShopCfg> shopCfgs)
         {

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

@@ -143,13 +143,10 @@ namespace GFGGame
 
         public void OnFinishZCJBStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
-            ViewManager.Show<ActivityZCJBChapterView>(new object[] { 61001, 2 });
+            ViewManager.Show<ActivityZCJBChapterView>(new object[] { ActivityDataManager.Instance.activityZCJBId, 2 });
         }
-        public async void OnFinishTimeTracingLevel(int levelCfgId, bool firstPass, bool success)
+        public void OnFinishTimeTracingLevel(int levelCfgId, bool firstPass, bool success)
         {
-            await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
-            await TimeTracingSProxy.ReqGetLevelRewardStatus();
-            await TimeTracingSProxy.ReqGetSuitRewardStatus();
             ViewManager.Show<TimeTracingLevelView>(new object[] { TimeTracingDataManager._currentChapterId, TimeTracingDataManager.SuitID});
         }
 

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

@@ -7,12 +7,12 @@ namespace GFGGame
 {
     public class TimeTracingDataManager : SingletonBase<TimeTracingDataManager>
     {
-        public List<int> IdList = new List<int>() { 5017, 5018, 5019 };
+        public List<int> IdList = new List<int>() { 5017, 5018 };
         public List<int> chapterIdList = new List<int>();
         //时光回溯,关卡编号
         public static int _currentChapterId = 62001;
         //时光回溯，合成套装副本当前展示套装
-        public static int SuitID = 201027;
+        public static int SuitID = 201030;
         //时光回溯刷新时间
         public static long RefreshTime = 0;
         //章节积分奖励列表
@@ -22,8 +22,16 @@ namespace GFGGame
         //关卡信息
         public static Dictionary<int, Dictionary<int, LevelRoleInfoProto>> _LevelMaxInfoDic = new Dictionary<int, Dictionary<int, LevelRoleInfoProto>>();
 
-        public SuitCollectRankProto mySuitRankInfo;
-        public LevelRankProto myLevelRankInfo;
+        public Dictionary<int, SuitCollectRankProto> mySuitRankInfo = new Dictionary<int, SuitCollectRankProto>()
+        {
+            {0,new SuitCollectRankProto()},
+            {1,new SuitCollectRankProto()},
+        };
+        public Dictionary<int, LevelRankProto> myLevelRankInfo = new Dictionary<int, LevelRankProto>()
+        {
+            { 0,new LevelRankProto() },
+            { 1,new LevelRankProto() },
+        };
         //套装排行榜数据
         public Dictionary<int, List<SuitCollectRankProto>> SuitRankDatasDic = new Dictionary<int, List<SuitCollectRankProto>>()
         {

GameClient/Assets/Game/HotUpdate/Data/VO/CollectPartData.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class CollectPartData
+    {
+        public int PartID;
+        public int LevelID;
+        public int LevelNum;
+        public float AddNum;
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/VO/CollectPartData.cs.meta

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

GameClient/Assets/Game/HotUpdate/Data/VO/ItemData.cs

@@ -77,7 +77,8 @@ namespace GFGGame
             }
             AttributesDic.TryGetValue(CalculateHelper.GetItemScoreKey(scoreType, (int)ConstItemAttributeActionType.ADD_VALUE), out var valueAdd);
             AttributesDic.TryGetValue(CalculateHelper.GetItemScoreKey(scoreType, (int)ConstItemAttributeActionType.ADD_PERCENT), out var percentAdd);
-            return CalculateHelper.GetItemAttribute(valueBase, percentAdd, valueAdd);
+            float count = (float)CalculateHelper.GetItemAttribute(valueBase, percentAdd, valueAdd) * CollectPartDataManager.Instance.GetEquipScoresWithPartId(id);
+            return (int)count;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -265,7 +265,7 @@ namespace GFGGame
         /// <param name="excludeType">排除类型列表</param>
         /// <param name="showOptional">是否显示可选部件</param>
         /// <param name="CheckOwn">是否只显示主角拥有的部件</param>
-        public void PutOnSuitCfg(int suitId, bool tryShowAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true)
+        public void PutOnSuitCfg(int suitId, bool tryShowAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true,bool isDress = false)
         {
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
             if(suitCfg == null)
@@ -278,7 +278,7 @@ namespace GFGGame
             _dressUpData.actionId = (hasSuitActionRes && tryShowAction) ? suitId : 0;
             
             //找到要穿的散件
-            List<int> targetItemList = DressUpUtil.GetSuitItems(suitId, IsAction, excludeType, showOptional, CheckOwn);
+            List<int> targetItemList = DressUpUtil.GetSuitItems(suitId, IsAction, excludeType, showOptional, CheckOwn, isDress);
             CompareAndAddItemList(oldIsAction, IsAction, targetItemList);
             checkDefaultItem();
         }

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -524,7 +524,7 @@ namespace GFGGame
             }
         }
 
-        public static List<int> GetSuitItems(int suitId, bool isAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true)
+        public static List<int> GetSuitItems(int suitId, bool isAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true,bool isDress = false)
         {
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
             if (suitCfg == null)
@@ -544,7 +544,7 @@ namespace GFGGame
             List<int> targetItemList = new List<int>();
             foreach (int itemId in items)
             {
-                if (!CheckOwn || DressUpMenuItemDataManager.CheckHasItem(itemId))
+                if (!CheckOwn || DressUpMenuItemDataManager.CheckHasItem(itemId) || isDress)
                 {
                     subType = ItemDataManager.GetItemSubType(itemId);
                     bool notInAction = SuitCfgArray.Instance.CheckItemNotInAction(itemId);

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -180,6 +180,29 @@ namespace GFGGame
                 //StoryDialogDataManager.Instance.dialogShowDelay = 0.4f;
             }
         }
+        //更新人物表情
+        public static void UpdateEmojiAni(string value, ref GameObject animObj)
+        {
+            if (value == "0")
+            {
+                if (animObj != null)
+                {
+                    PrefabManager.Instance.Restore(animObj);
+                    animObj = null;
+                }
+            }
+            else
+            {
+                PrefabManager.Instance.Restore(animObj);
+                animObj = null;
+                value = string.Format("DressUp/{0}", value);
+                string res = value.Split('/')[1];
+                animObj = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetStoryDialogCGPath(value, res));
+                animObj.transform.position = new Vector3(0, -9, 0);
+                animObj.transform.localScale = new Vector3(2.5f, 2.5f, 2.5f);
+                //StoryDialogDataManager.Instance.dialogShowDelay = 0.4f;
+            }
+        }
 
 
         public static void ControlBgVisible(GameObject sceneObj, bool isShow)

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -5,7 +5,8 @@ namespace ET
 {
     public static class LoginHelper
     {
-        public static async ETTask<(int, long)> LoginTest(Scene zoneScene, string address, string account, bool cancelDelete)
+        public static async ETTask<(int, long)> LoginTest(Scene zoneScene, string address, string account,
+            bool cancelDelete)
         {
             A2C_LoginAccount a2CLoginAccount = null;
             Session accountSession = null;
@@ -19,7 +20,8 @@ namespace ET
                     Version = GameConst.SERVER_VERSION,
                     PlatformId = LauncherConfig.platformId,
                     ChannelId = LauncherConfig.ChannelId,
-                    CancelDelete = cancelDelete
+                    CancelDelete = cancelDelete,
+                    Token = QDDouYouManager.Instance.token
                 });
             }
             catch (Exception e)
@@ -34,12 +36,14 @@ namespace ET
                 accountSession?.Dispose();
                 return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
+
             OnLoginSuccess(zoneScene, a2CLoginAccount, accountSession, account);
 
             return (ErrorCode.ERR_Success, 0);
         }
 
-        public static async ETTask<(int, long)> Login(Scene zoneScene, string address, string account, string password, bool isMD5, bool cancelDelete)
+        public static async ETTask<(int, long)> Login(Scene zoneScene, string address, string account, string password,
+            bool isMD5, bool cancelDelete)
         {
             A2C_LoginAccount a2CLoginAccount = null;
             Session accountSession = null;
@@ -52,6 +56,7 @@ namespace ET
                 {
                     passwordMD5 = MD5Helper.stringMD5(password);
                 }
+
                 a2CLoginAccount = (A2C_LoginAccount)await accountSession.Call(new C2A_LoginAccount()
                 {
                     Account = account,
@@ -74,12 +79,14 @@ namespace ET
                 accountSession?.Dispose();
                 return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
+
             OnLoginSuccess(zoneScene, a2CLoginAccount, accountSession, account);
 
             return (ErrorCode.ERR_Success, 0);
         }
 
-        public static void OnLoginSuccess(Scene zoneScene, A2C_LoginAccount a2CLoginAccount, Session accountSession, string account)
+        public static void OnLoginSuccess(Scene zoneScene, A2C_LoginAccount a2CLoginAccount, Session accountSession,
+            string account)
         {
             zoneScene.GetComponent<SessionComponent>().AccountSession = accountSession;
             accountSession.AddComponent<PingComponent>();
@@ -93,7 +100,8 @@ namespace ET
         }
 
 
-        public static async ETTask<int> Register(Scene zoneScene, string address, string account, string password, string name, string identityNum, string code)
+        public static async ETTask<int> Register(Scene zoneScene, string address, string account, string password,
+            string name, string identityNum, string code)
         {
             A2C_Register r2C_Register = null;
             Session session = null;
@@ -125,6 +133,7 @@ namespace ET
                 Log.Debug(e.ToString());
                 return ErrorCode.ERR_NetWorkError;
             }
+
             return ErrorCode.ERR_Success;
         }
 
@@ -134,11 +143,12 @@ namespace ET
 
             try
             {
-                a2C_GetServerInfos = (A2C_GetServerInfos)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetServerInfos()
-                {
-                    AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
-                    Token = zoneScene.GetComponent<AccountInfoComponent>().Token
-                });
+                a2C_GetServerInfos = (A2C_GetServerInfos)await zoneScene.GetComponent<SessionComponent>().AccountSession
+                    ?.Call(new C2A_GetServerInfos()
+                    {
+                        AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
+                        Token = zoneScene.GetComponent<AccountInfoComponent>().Token
+                    });
             }
             catch (Exception e)
             {
@@ -150,6 +160,7 @@ namespace ET
             {
                 return a2C_GetServerInfos.Error;
             }
+
             zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             foreach (var serverInfoProto in a2C_GetServerInfos.ServerInfosList)
             {
@@ -157,6 +168,7 @@ namespace ET
                 serverInfo.FromMessage(serverInfoProto);
                 zoneScene.GetComponent<ServerInfosComponent>().Add(serverInfo);
             }
+
             zoneScene.GetComponent<ServerInfosComponent>().SetRecentlyServerInfo(a2C_GetServerInfos.RecentId);
 
             await ETTask.CompletedTask;
@@ -169,12 +181,13 @@ namespace ET
 
             try
             {
-                a2C_GetRoles = (A2C_GetRoles)await zoneScene.GetComponent<SessionComponent>().AccountSession.Call(new C2A_GetRoles()
-                {
-                    AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
-                    Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
-                    ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId,
-                });
+                a2C_GetRoles = (A2C_GetRoles)await zoneScene.GetComponent<SessionComponent>().AccountSession.Call(
+                    new C2A_GetRoles()
+                    {
+                        AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
+                        Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
+                        ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId,
+                    });
             }
             catch (Exception e)
             {
@@ -204,13 +217,14 @@ namespace ET
             A2C_CreateRole a2C_CreateRole = null;
             try
             {
-                a2C_CreateRole = (A2C_CreateRole)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_CreateRole
-                {
-                    AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
-                    Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
-                    Name = name,
-                    ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId,
-                });
+                a2C_CreateRole = (A2C_CreateRole)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(
+                    new C2A_CreateRole
+                    {
+                        AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
+                        Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
+                        Name = name,
+                        ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId,
+                    });
             }
             catch (Exception e)
             {
@@ -237,13 +251,14 @@ namespace ET
 
             try
             {
-                a2C_DeleteRole = (A2C_DeleteRole)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_DeleteRole()
-                {
-                    AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
-                    Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
-                    RoleInfoId = roleId,
-                    ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId,
-                });
+                a2C_DeleteRole = (A2C_DeleteRole)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(
+                    new C2A_DeleteRole()
+                    {
+                        AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
+                        Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
+                        RoleInfoId = roleId,
+                        ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId,
+                    });
             }
             catch (Exception e)
             {
@@ -257,7 +272,10 @@ namespace ET
                 return a2C_DeleteRole.Error;
             }
 
-            int index = zoneScene.GetComponent<RoleInfosComponent>().RoleInfos.FindIndex((info) => { return info.Id == a2C_DeleteRole.DeleteRoleInfoId; });
+            int index = zoneScene.GetComponent<RoleInfosComponent>().RoleInfos.FindIndex((info) =>
+            {
+                return info.Id == a2C_DeleteRole.DeleteRoleInfoId;
+            });
             zoneScene.GetComponent<RoleInfosComponent>().RoleInfos.RemoveAt(index);
 
             await ETTask.CompletedTask;
@@ -270,12 +288,13 @@ namespace ET
 
             try
             {
-                a2C_GetRealmKey = (A2C_GetRealmKey)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetRealmKey()
-                {
-                    AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
-                    Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
-                    ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId,
-                });
+                a2C_GetRealmKey = (A2C_GetRealmKey)await zoneScene.GetComponent<SessionComponent>().AccountSession
+                    ?.Call(new C2A_GetRealmKey()
+                    {
+                        AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
+                        Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
+                        ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId,
+                    });
             }
             catch (Exception e)
             {
@@ -303,7 +322,8 @@ namespace ET
             //1.连接Realm，获取分配的Gate
             R2C_LoginRealm r2C_LoginRealm = null;
 
-            Session session = zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(realmAddress));
+            Session session = zoneScene.GetComponent<NetKcpComponent>()
+                .Create(NetworkHelper.ToIPEndPoint(realmAddress));
             try
             {
                 r2C_LoginRealm = (R2C_LoginRealm)await session.Call(new C2R_LoginRealm()
@@ -318,6 +338,7 @@ namespace ET
                 session?.Dispose();
                 return ErrorCode.ERR_NetWorkError;
             }
+
             session?.Dispose();
 
             if (r2C_LoginRealm.Error != ErrorCode.ERR_Success)
@@ -326,7 +347,8 @@ namespace ET
             }
 
             LogUtil.LogDev($"GateAddress : {r2C_LoginRealm.GateAddress}");
-            Session gateSession = zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(r2C_LoginRealm.GateAddress));
+            Session gateSession = zoneScene.GetComponent<NetKcpComponent>()
+                .Create(NetworkHelper.ToIPEndPoint(r2C_LoginRealm.GateAddress));
             gateSession.AddComponent<PingComponent>();
             gateSession.AddComponent<DisConnectedCompnent>().SessionState = SessionState.Gate;
             zoneScene.GetComponent<SessionComponent>().GateSession = gateSession;
@@ -357,6 +379,7 @@ namespace ET
                 zoneScene.GetComponent<SessionComponent>().GateSession?.Dispose();
                 return g2C_LoginGate.Error;
             }
+
             LogUtil.LogDev("登陆gate成功！");
 
             //3.角色正式请求进入游戏逻辑服
@@ -377,12 +400,15 @@ namespace ET
                 //Log.Error(g2C_EnterGame.Error.ToString());
                 return g2C_EnterGame.Error;
             }
+
             zoneScene.GetComponent<PlayerComponent>().MyId = g2C_EnterGame.MyId;
-            var result = await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeStart>();
-            if(result.Error == WaitTypeError.Cancel)
+            var result = await GameGlobal.zoneScene.GetComponent<ObjectWait>()
+                .Wait<ET.WaitType.Wait_SceneChangeStart>();
+            if (result.Error == WaitTypeError.Cancel)
             {
                 return ErrorCode.ERR_Cancel;
             }
+
             LogUtil.LogDev("角色进入游戏成功！");
             return ErrorCode.ERR_Success;
         }
@@ -392,7 +418,8 @@ namespace ET
             A2C_GetLatestNotice response = null;
             try
             {
-                response = (A2C_GetLatestNotice)await GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetLatestNotice());
+                response = (A2C_GetLatestNotice)await GameGlobal.zoneScene.GetComponent<SessionComponent>()
+                    .AccountSession?.Call(new C2A_GetLatestNotice());
             }
             catch (Exception e)
             {
@@ -405,6 +432,7 @@ namespace ET
                 //Log.Error(response.Error.ToString());
                 return response.Error;
             }
+
             NoticeInfo noticeInfo = new NoticeInfo();
             noticeInfo.noticeId = response.NoticeId;
             noticeInfo.title = response.Title;
@@ -415,6 +443,7 @@ namespace ET
 
             return ErrorCode.ERR_Success;
         }
+
         public static async ETTask<(int, string)> ReqRandomRoleName()
         {
             A2C_GetRandomRoleName response = null;
@@ -423,8 +452,10 @@ namespace ET
             if (accountSession == null || accountSession.IsDisposed)
             {
                 notLogin = true;
-                accountSession = GameGlobal.zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+                accountSession = GameGlobal.zoneScene.GetComponent<NetKcpComponent>()
+                    .Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
             }
+
             try
             {
                 response = (A2C_GetRandomRoleName)await accountSession?.Call(new C2A_GetRandomRoleName()
@@ -439,6 +470,7 @@ namespace ET
                 {
                     accountSession?.Dispose();
                 }
+
                 return (ErrorCode.ERR_NetWorkError, "");
             }
 
@@ -449,6 +481,7 @@ namespace ET
                 {
                     accountSession?.Dispose();
                 }
+
                 return (ErrorCode.ERR_NetWorkError, "");
             }
 
@@ -456,6 +489,7 @@ namespace ET
             {
                 accountSession?.Dispose();
             }
+
             return (ErrorCode.ERR_Success, response.Name);
         }
     }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaVisitUI.cs

@@ -13,7 +13,6 @@ namespace UI.ActivityAfternoonTea
         public GTextField m_time;
         public GLoader m_ruleIcon;
         public GList m_taskList;
-        public GImage m_visitNumTips;
         public GTextField m_visitNum;
         public const string URL = "ui://wpsqkdbznjone";
         public const string PACKAGE_NAME = "ActivityAfternoonTea";
@@ -68,7 +67,6 @@ namespace UI.ActivityAfternoonTea
             m_time = (GTextField)comp.GetChild("time");
             m_ruleIcon = (GLoader)comp.GetChild("ruleIcon");
             m_taskList = (GList)comp.GetChild("taskList");
-            m_visitNumTips = (GImage)comp.GetChild("visitNumTips");
             m_visitNum = (GTextField)comp.GetChild("visitNum");
         }
         public void Dispose(bool disposeTarget = false)
@@ -79,7 +77,6 @@ namespace UI.ActivityAfternoonTea
             m_time = null;
             m_ruleIcon = null;
             m_taskList = null;
-            m_visitNumTips = null;
             m_visitNum = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJB.cs

@@ -11,6 +11,7 @@ namespace UI.ActivityMain
         public GLoader m_icon;
         public GButton m_rewardBTn;
         public GTextField m_activityTime;
+        public GGroup m_time;
         public GLoader m_backBtn;
         public GLoader m_viewBtn;
         public GLoader m_shopBtn;
@@ -67,6 +68,7 @@ namespace UI.ActivityMain
             m_icon = (GLoader)comp.GetChild("icon");
             m_rewardBTn = (GButton)comp.GetChild("rewardBTn");
             m_activityTime = (GTextField)comp.GetChild("activityTime");
+            m_time = (GGroup)comp.GetChild("time");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_viewBtn = (GLoader)comp.GetChild("viewBtn");
             m_shopBtn = (GLoader)comp.GetChild("shopBtn");
@@ -79,6 +81,7 @@ namespace UI.ActivityMain
             m_icon = null;
             m_rewardBTn = null;
             m_activityTime = null;
+            m_time = null;
             m_backBtn = null;
             m_viewBtn = null;
             m_shopBtn = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Btn18.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_Btn18
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_bg;
+        public const string URL = "ui://4ht5s77uuje12q";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "Btn18";
+        private static UI_Btn18 _proxy;
+
+        public static UI_Btn18 Create(GObject gObject = null)
+        {
+            var ui = new UI_Btn18();
+            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_Btn18 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Btn18();
+            }
+            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_c1 = comp.GetController("c1");
+            m_bg = (GLoader)comp.GetChild("bg");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Btn18.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button10.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_Button10
+    {
+        public GButton target;
+        public GTextField m_Number;
+        public const string URL = "ui://4ht5s77uuje11t";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "Button10";
+        private static UI_Button10 _proxy;
+
+        public static UI_Button10 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button10();
+            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_Button10 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button10();
+            }
+            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_Number = (GTextField)comp.GetChild("Number");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_Number = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button10.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button11.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_Button11
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_bg;
+        public GLoader m_bgSelect;
+        public const string URL = "ui://4ht5s77uuje124";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "Button11";
+        private static UI_Button11 _proxy;
+
+        public static UI_Button11 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button11();
+            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_Button11 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button11();
+            }
+            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_c1 = comp.GetController("c1");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_bgSelect = (GLoader)comp.GetChild("bgSelect");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            m_bgSelect = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button11.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button12.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_Button12
+    {
+        public GButton target;
+        public GTextField m_txtIcon;
+        public GTextField m_txtOriginalPrice;
+        public GGroup m_grpOriginalPrice;
+        public GTextField m_txtPrice;
+        public const string URL = "ui://4ht5s77uuje12c";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "Button12";
+        private static UI_Button12 _proxy;
+
+        public static UI_Button12 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button12();
+            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_Button12 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button12();
+            }
+            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_txtIcon = (GTextField)comp.GetChild("txtIcon");
+            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
+            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtIcon = null;
+            m_txtOriginalPrice = null;
+            m_grpOriginalPrice = null;
+            m_txtPrice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button12.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button13.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_Button13
+    {
+        public GButton target;
+        public GTextField m_txtIcon;
+        public GTextField m_txtOriginalPrice;
+        public GGroup m_grpOriginalPrice;
+        public GTextField m_txtPrice;
+        public const string URL = "ui://4ht5s77uuje12w";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "Button13";
+        private static UI_Button13 _proxy;
+
+        public static UI_Button13 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button13();
+            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_Button13 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button13();
+            }
+            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_txtIcon = (GTextField)comp.GetChild("txtIcon");
+            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
+            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtIcon = null;
+            m_txtOriginalPrice = null;
+            m_grpOriginalPrice = null;
+            m_txtPrice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button13.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button14.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_Button14
+    {
+        public GButton target;
+        public GTextField m_Number;
+        public const string URL = "ui://4ht5s77uuje12x";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "Button14";
+        private static UI_Button14 _proxy;
+
+        public static UI_Button14 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button14();
+            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_Button14 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button14();
+            }
+            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_Number = (GTextField)comp.GetChild("Number");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_Number = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button14.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_NewPlayersTipsUI.cs

@@ -0,0 +1,98 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_NewPlayersTipsUI
+    {
+        public GComponent target;
+        public GLoader m_btnBack;
+        public GLoader m_icon;
+        public GTextField m_activityDesc;
+        public GButton m_GetRewardBtn;
+        public GLoader m_backBtn;
+        public GGraph m_effectBtn;
+        public GGraph m_effectBG;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t4;
+        public const string URL = "ui://4ht5s77uqdyb1f";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "NewPlayersTipsUI";
+        private static UI_NewPlayersTipsUI _proxy;
+
+        public static UI_NewPlayersTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewPlayersTipsUI();
+            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_NewPlayersTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewPlayersTipsUI();
+            }
+            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_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_activityDesc = (GTextField)comp.GetChild("activityDesc");
+            m_GetRewardBtn = (GButton)comp.GetChild("GetRewardBtn");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_effectBtn = (GGraph)comp.GetChild("effectBtn");
+            m_effectBG = (GGraph)comp.GetChild("effectBG");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t4 = comp.GetTransition("t4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_icon = null;
+            m_activityDesc = null;
+            m_GetRewardBtn = null;
+            m_backBtn = null;
+            m_effectBtn = null;
+            m_effectBG = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_NewPlayersTipsUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_PearlRebateTipsUI.cs

@@ -0,0 +1,127 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_PearlRebateTipsUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_timeText;
+        public UI_Button11 m_one;
+        public UI_Btn18 m_two;
+        public UI_btn30 m_three;
+        public GComponent m_item0;
+        public GComponent m_item1;
+        public GComponent m_item2;
+        public UI_Button10 m_buyBtn;
+        public UI_Button14 m_gotbtn;
+        public GLoader m_backBtn;
+        public GImage m_TipImg;
+        public GLoader m_notTips;
+        public GGraph m_effectBtn;
+        public GGraph m_effectBG;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t4;
+        public const string URL = "ui://4ht5s77u7xo51s";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "PearlRebateTipsUI";
+        private static UI_PearlRebateTipsUI _proxy;
+
+        public static UI_PearlRebateTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_PearlRebateTipsUI();
+            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_PearlRebateTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_PearlRebateTipsUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_one = (UI_Button11)UI_Button11.Create(comp.GetChild("one"));
+            m_two = (UI_Btn18)UI_Btn18.Create(comp.GetChild("two"));
+            m_three = (UI_btn30)UI_btn30.Create(comp.GetChild("three"));
+            m_item0 = (GComponent)comp.GetChild("item0");
+            m_item1 = (GComponent)comp.GetChild("item1");
+            m_item2 = (GComponent)comp.GetChild("item2");
+            m_buyBtn = (UI_Button10)UI_Button10.Create(comp.GetChild("buyBtn"));
+            m_gotbtn = (UI_Button14)UI_Button14.Create(comp.GetChild("gotbtn"));
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_TipImg = (GImage)comp.GetChild("TipImg");
+            m_notTips = (GLoader)comp.GetChild("notTips");
+            m_effectBtn = (GGraph)comp.GetChild("effectBtn");
+            m_effectBG = (GGraph)comp.GetChild("effectBG");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t4 = comp.GetTransition("t4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_timeText = null;
+            m_one.Dispose();
+            m_one = null;
+            m_two.Dispose();
+            m_two = null;
+            m_three.Dispose();
+            m_three = null;
+            m_item0 = null;
+            m_item1 = null;
+            m_item2 = null;
+            m_buyBtn.Dispose();
+            m_buyBtn = null;
+            m_gotbtn.Dispose();
+            m_gotbtn = null;
+            m_backBtn = null;
+            m_TipImg = null;
+            m_notTips = null;
+            m_effectBtn = null;
+            m_effectBG = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_PearlRebateTipsUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_SevenDailyTipsUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_SevenDailyTipsUI
+    {
+        public GComponent target;
+        public GLoader m_btnBack;
+        public GLoader m_icon;
+        public GLoader m_backBtn;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t4;
+        public const string URL = "ui://4ht5s77uymxo1o";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "SevenDailyTipsUI";
+        private static UI_SevenDailyTipsUI _proxy;
+
+        public static UI_SevenDailyTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SevenDailyTipsUI();
+            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_SevenDailyTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SevenDailyTipsUI();
+            }
+            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_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t4 = comp.GetTransition("t4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_icon = null;
+            m_backBtn = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_SevenDailyTipsUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_WeeklyGiftTipsUI.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_WeeklyGiftTipsUI
+    {
+        public GComponent target;
+        public GTextField m_descText;
+        public GList m_rewardList;
+        public GButton m_buyBtn;
+        public GTextField m_timeText;
+        public GLoader m_backBtn;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public Transition m_t0;
+        public const string URL = "ui://4ht5s77udm9g39";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "WeeklyGiftTipsUI";
+        private static UI_WeeklyGiftTipsUI _proxy;
+
+        public static UI_WeeklyGiftTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_WeeklyGiftTipsUI();
+            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_WeeklyGiftTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_WeeklyGiftTipsUI();
+            }
+            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_descText = (GTextField)comp.GetChild("descText");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_buyBtn = (GButton)comp.GetChild("buyBtn");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_descText = null;
+            m_rewardList = null;
+            m_buyBtn = null;
+            m_timeText = null;
+            m_backBtn = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_WeeklyGiftTipsUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBBuyTips.cs

@@ -7,9 +7,9 @@ namespace UI.ActivityMain
     public partial class UI_ZCJBBuyTips
     {
         public GComponent target;
-        public GGraph m_graphBg;
         public GTextField m_txtContent;
         public GTextField m_txtTips;
+        public GTextField m_txtNumTips;
         public GButton m_btnLeft;
         public GButton m_btnRight;
         public const string URL = "ui://4ht5s77uqzw81c";
@@ -59,17 +59,17 @@ namespace UI.ActivityMain
 
         private void Init(GComponent comp)
         {
-            m_graphBg = (GGraph)comp.GetChild("graphBg");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_txtNumTips = (GTextField)comp.GetChild("txtNumTips");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_graphBg = null;
             m_txtContent = null;
             m_txtTips = null;
+            m_txtNumTips = null;
             m_btnLeft = null;
             m_btnRight = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ComItem000.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZGTHRewardItem.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.ActivityMain
 {
-    public partial class UI_ComItem000
+    public partial class UI_ZGTHRewardItem
     {
         public GComponent target;
-        public GComponent m_comItemIcon;
-        public GTextField m_txtName;
-        public const string URL = "ui://4ht5s77uqbf4v";
+        public GComponent m_item;
+        public GTextField m_name;
+        public const string URL = "ui://4ht5s77uuje12d";
         public const string PACKAGE_NAME = "ActivityMain";
-        public const string RES_NAME = "ComItem000";
-        private static UI_ComItem000 _proxy;
+        public const string RES_NAME = "ZGTHRewardItem";
+        private static UI_ZGTHRewardItem _proxy;
 
-        public static UI_ComItem000 Create(GObject gObject = null)
+        public static UI_ZGTHRewardItem Create(GObject gObject = null)
         {
-            var ui = new UI_ComItem000();
+            var ui = new UI_ZGTHRewardItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.ActivityMain
             return ui;
         }
 
-        public static UI_ComItem000 Proxy(GObject gObject = null)
+        public static UI_ZGTHRewardItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItem000();
+                _proxy = new UI_ZGTHRewardItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -56,13 +56,13 @@ namespace UI.ActivityMain
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (GComponent)comp.GetChild("comItemIcon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_item = (GComponent)comp.GetChild("item");
+            m_name = (GTextField)comp.GetChild("name");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comItemIcon = null;
-            m_txtName = null;
+            m_item = null;
+            m_name = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZGTHRewardItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZGTHgiftDCTipsUI.cs

@@ -0,0 +1,108 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ZGTHgiftDCTipsUI
+    {
+        public GComponent target;
+        public GLoader m_suitIcon;
+        public GTextField m_txtName;
+        public GList m_Itemlist;
+        public UI_Button12 m_btnCharge;
+        public GTextField m_timeText;
+        public GButton m_btnClose;
+        public GTextField m_discountText;
+        public GGroup m_DiscountGroud;
+        public GImage m_TipImg;
+        public GLoader m_notTips;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t4;
+        public const string URL = "ui://4ht5s77uuje122";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ZGTHgiftDCTipsUI";
+        private static UI_ZGTHgiftDCTipsUI _proxy;
+
+        public static UI_ZGTHgiftDCTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ZGTHgiftDCTipsUI();
+            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_ZGTHgiftDCTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ZGTHgiftDCTipsUI();
+            }
+            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_suitIcon = (GLoader)comp.GetChild("suitIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_Itemlist = (GList)comp.GetChild("Itemlist");
+            m_btnCharge = (UI_Button12)UI_Button12.Create(comp.GetChild("btnCharge"));
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_discountText = (GTextField)comp.GetChild("discountText");
+            m_DiscountGroud = (GGroup)comp.GetChild("DiscountGroud");
+            m_TipImg = (GImage)comp.GetChild("TipImg");
+            m_notTips = (GLoader)comp.GetChild("notTips");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t4 = comp.GetTransition("t4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_suitIcon = null;
+            m_txtName = null;
+            m_Itemlist = null;
+            m_btnCharge.Dispose();
+            m_btnCharge = null;
+            m_timeText = null;
+            m_btnClose = null;
+            m_discountText = null;
+            m_DiscountGroud = null;
+            m_TipImg = null;
+            m_notTips = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZGTHgiftDCTipsUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZGTHgiftTipsUI.cs

@@ -0,0 +1,96 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ZGTHgiftTipsUI
+    {
+        public GComponent target;
+        public GList m_Itemlist;
+        public UI_Button13 m_btnBuy;
+        public GButton m_btnClose;
+        public GTextField m_timeText;
+        public GImage m_TipImg;
+        public GLoader m_notTips;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t4;
+        public const string URL = "ui://4ht5s77uuje11x";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ZGTHgiftTipsUI";
+        private static UI_ZGTHgiftTipsUI _proxy;
+
+        public static UI_ZGTHgiftTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ZGTHgiftTipsUI();
+            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_ZGTHgiftTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ZGTHgiftTipsUI();
+            }
+            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_Itemlist = (GList)comp.GetChild("Itemlist");
+            m_btnBuy = (UI_Button13)UI_Button13.Create(comp.GetChild("btnBuy"));
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_TipImg = (GImage)comp.GetChild("TipImg");
+            m_notTips = (GLoader)comp.GetChild("notTips");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t4 = comp.GetTransition("t4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_Itemlist = null;
+            m_btnBuy.Dispose();
+            m_btnBuy = null;
+            m_btnClose = null;
+            m_timeText = null;
+            m_TipImg = null;
+            m_notTips = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZGTHgiftTipsUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_btn30.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_btn30
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_bg;
+        public const string URL = "ui://4ht5s77uuje12s";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "btn30";
+        private static UI_btn30 _proxy;
+
+        public static UI_btn30 Create(GObject gObject = null)
+        {
+            var ui = new UI_btn30();
+            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_btn30 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_btn30();
+            }
+            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_c1 = comp.GetController("c1");
+            m_bg = (GLoader)comp.GetChild("bg");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_btn30.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaUI.cs

@@ -12,6 +12,7 @@ namespace UI.Arena
         public GButton m_btnBack;
         public GComponent m_valueBar;
         public UI_ComTheme m_comTheme;
+        public GButton m_btnRank;
         public GTextField m_txtTime;
         public GButton m_btnRule;
         public GGroup m_gtpTop;
@@ -22,22 +23,22 @@ namespace UI.Arena
         public GLoader m_loaDanIcon;
         public GTextField m_txtName;
         public GTextField m_txtDanTitle;
+        public GButton m_btnFightScoreRule;
         public GTextField m_txtRank;
         public GTextField m_txtFightScore;
-        public GButton m_btnFightScoreRule;
-        public UI_ComFightScore m_comFightScore;
+        public GLoader m_rankIcon;
         public GTextField m_txtMoneyCount;
         public GButton m_btnAddFightCount;
         public GTextField m_txtFightCount;
         public GTextField m_txtRefreshCount;
         public GButton m_btnRefresh;
         public UI_ComCostCurrency m_comCostCurrent;
+        public UI_ComFightScore m_comFightScore;
         public GButton m_btnQuickFight;
         public GButton m_btnShop;
-        public GButton m_btnDress;
         public GButton m_btnReward;
-        public GButton m_btnRank;
         public GButton m_btnRecord;
+        public GButton m_btnDress;
         public GGroup m_grpBottom;
         public const string URL = "ui://4lc5fhlbpsph0";
         public const string PACKAGE_NAME = "Arena";
@@ -91,6 +92,7 @@ namespace UI.Arena
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comTheme = (UI_ComTheme)UI_ComTheme.Create(comp.GetChild("comTheme"));
+            m_btnRank = (GButton)comp.GetChild("btnRank");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_gtpTop = (GGroup)comp.GetChild("gtpTop");
@@ -101,22 +103,22 @@ namespace UI.Arena
             m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
-            m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
-            m_comFightScore = (UI_ComFightScore)UI_ComFightScore.Create(comp.GetChild("comFightScore"));
+            m_rankIcon = (GLoader)comp.GetChild("rankIcon");
             m_txtMoneyCount = (GTextField)comp.GetChild("txtMoneyCount");
             m_btnAddFightCount = (GButton)comp.GetChild("btnAddFightCount");
             m_txtFightCount = (GTextField)comp.GetChild("txtFightCount");
             m_txtRefreshCount = (GTextField)comp.GetChild("txtRefreshCount");
             m_btnRefresh = (GButton)comp.GetChild("btnRefresh");
             m_comCostCurrent = (UI_ComCostCurrency)UI_ComCostCurrency.Create(comp.GetChild("comCostCurrent"));
+            m_comFightScore = (UI_ComFightScore)UI_ComFightScore.Create(comp.GetChild("comFightScore"));
             m_btnQuickFight = (GButton)comp.GetChild("btnQuickFight");
             m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnDress = (GButton)comp.GetChild("btnDress");
             m_btnReward = (GButton)comp.GetChild("btnReward");
-            m_btnRank = (GButton)comp.GetChild("btnRank");
             m_btnRecord = (GButton)comp.GetChild("btnRecord");
+            m_btnDress = (GButton)comp.GetChild("btnDress");
             m_grpBottom = (GGroup)comp.GetChild("grpBottom");
         }
         public void Dispose(bool disposeTarget = false)
@@ -127,6 +129,7 @@ namespace UI.Arena
             m_valueBar = null;
             m_comTheme.Dispose();
             m_comTheme = null;
+            m_btnRank = null;
             m_txtTime = null;
             m_btnRule = null;
             m_gtpTop = null;
@@ -137,11 +140,10 @@ namespace UI.Arena
             m_loaDanIcon = null;
             m_txtName = null;
             m_txtDanTitle = null;
+            m_btnFightScoreRule = null;
             m_txtRank = null;
             m_txtFightScore = null;
-            m_btnFightScoreRule = null;
-            m_comFightScore.Dispose();
-            m_comFightScore = null;
+            m_rankIcon = null;
             m_txtMoneyCount = null;
             m_btnAddFightCount = null;
             m_txtFightCount = null;
@@ -149,12 +151,13 @@ namespace UI.Arena
             m_btnRefresh = null;
             m_comCostCurrent.Dispose();
             m_comCostCurrent = null;
+            m_comFightScore.Dispose();
+            m_comFightScore = null;
             m_btnQuickFight = null;
             m_btnShop = null;
-            m_btnDress = null;
             m_btnReward = null;
-            m_btnRank = null;
             m_btnRecord = null;
+            m_btnDress = null;
             m_grpBottom = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListTargetItem.cs

@@ -10,9 +10,11 @@ namespace UI.Arena
         public GLoader m_loaBg;
         public GComponent m_comHead;
         public GComponent m_comLv;
+        public GTextField m_lvText;
         public GTextField m_txtName;
         public GButton m_btnLook;
         public GTextField m_txtDanTitle;
+        public GLoader m_rankIcon;
         public GTextField m_txtRank;
         public GTextField m_txtFightScore;
         public GImage m_imgUpDan;
@@ -67,9 +69,11 @@ namespace UI.Arena
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_comLv = (GComponent)comp.GetChild("comLv");
+            m_lvText = (GTextField)comp.GetChild("lvText");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnLook = (GButton)comp.GetChild("btnLook");
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_rankIcon = (GLoader)comp.GetChild("rankIcon");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
             m_imgUpDan = (GImage)comp.GetChild("imgUpDan");
@@ -80,9 +84,11 @@ namespace UI.Arena
             m_loaBg = null;
             m_comHead = null;
             m_comLv = null;
+            m_lvText = null;
             m_txtName = null;
             m_btnLook = null;
             m_txtDanTitle = null;
+            m_rankIcon = null;
             m_txtRank = null;
             m_txtFightScore = null;
             m_imgUpDan = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardFosterUI.cs

@@ -15,6 +15,7 @@ namespace UI.Card
         public GLoader m_loaListener1;
         public UI_ComFosterTop m_ComFosterTop;
         public UI_ComFosterBottom m_ComFosterBottom;
+        public GButton m_cardSyntheticBtn;
         public GLoader m_loaGuide;
         public GButton m_btnLeft;
         public GButton m_btnRight;
@@ -77,6 +78,7 @@ namespace UI.Card
             m_loaListener1 = (GLoader)comp.GetChild("loaListener1");
             m_ComFosterTop = (UI_ComFosterTop)UI_ComFosterTop.Create(comp.GetChild("ComFosterTop"));
             m_ComFosterBottom = (UI_ComFosterBottom)UI_ComFosterBottom.Create(comp.GetChild("ComFosterBottom"));
+            m_cardSyntheticBtn = (GButton)comp.GetChild("cardSyntheticBtn");
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
@@ -99,6 +101,7 @@ namespace UI.Card
             m_ComFosterTop = null;
             m_ComFosterBottom.Dispose();
             m_ComFosterBottom = null;
+            m_cardSyntheticBtn = null;
             m_loaGuide = null;
             m_btnLeft = null;
             m_btnRight = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardSkillUI.cs

@@ -15,7 +15,10 @@ namespace UI.Card
         public UI_ComSkillDiscribe m_comNextLv;
         public GList m_listConsume;
         public GComponent m_comConsume;
+        public GButton m_btnUpLvSpecial;
         public GButton m_btnUpLv;
+        public GButton m_btnCheckself;
+        public GButton m_btnCheckother;
         public GGroup m_lvInfo;
         public GGraph m_holderIcon;
         public const string URL = "ui://7l6lvkayrhha9m";
@@ -73,7 +76,10 @@ namespace UI.Card
             m_comNextLv = (UI_ComSkillDiscribe)UI_ComSkillDiscribe.Create(comp.GetChild("comNextLv"));
             m_listConsume = (GList)comp.GetChild("listConsume");
             m_comConsume = (GComponent)comp.GetChild("comConsume");
+            m_btnUpLvSpecial = (GButton)comp.GetChild("btnUpLvSpecial");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
+            m_btnCheckself = (GButton)comp.GetChild("btnCheckself");
+            m_btnCheckother = (GButton)comp.GetChild("btnCheckother");
             m_lvInfo = (GGroup)comp.GetChild("lvInfo");
             m_holderIcon = (GGraph)comp.GetChild("holderIcon");
         }
@@ -89,7 +95,10 @@ namespace UI.Card
             m_comNextLv = null;
             m_listConsume = null;
             m_comConsume = null;
+            m_btnUpLvSpecial = null;
             m_btnUpLv = null;
+            m_btnCheckself = null;
+            m_btnCheckother = null;
             m_lvInfo = null;
             m_holderIcon = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cbdde57deb9efce479070013f90050ef
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_CardSyntheticUI.cs

@@ -0,0 +1,144 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CardSynthetic
+{
+    public partial class UI_CardSyntheticUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GLoader m_loaBg2;
+        public UI_ComImgCard m_comImgCard;
+        public GList m_listMaterias;
+        public GButton m_btnProduction;
+        public GComponent m_comCostCurrency;
+        public GLoader m_loaRarity;
+        public GTextField m_txtName0;
+        public GTextField m_txtName1;
+        public GTextField m_txtName2;
+        public GTextField m_txtName3;
+        public GTextField m_txtName4;
+        public GTextField m_txtGong;
+        public GTextField m_txtShang;
+        public GTextField m_txtJue;
+        public GTextField m_txtZhi;
+        public GTextField m_skillCountText;
+        public GLoader m_skillIcon;
+        public GTextField m_timesText;
+        public GTextField m_descText;
+        public GButton m_btnBack;
+        public GButton m_btnHome;
+        public GComponent m_valueBar;
+        public Transition m_hide;
+        public Transition m_show;
+        public const string URL = "ui://c6tzok8ouje12n";
+        public const string PACKAGE_NAME = "CardSynthetic";
+        public const string RES_NAME = "CardSyntheticUI";
+        private static UI_CardSyntheticUI _proxy;
+
+        public static UI_CardSyntheticUI Create(GObject gObject = null)
+        {
+            var ui = new UI_CardSyntheticUI();
+            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_CardSyntheticUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CardSyntheticUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaBg2 = (GLoader)comp.GetChild("loaBg2");
+            m_comImgCard = (UI_ComImgCard)UI_ComImgCard.Create(comp.GetChild("comImgCard"));
+            m_listMaterias = (GList)comp.GetChild("listMaterias");
+            m_btnProduction = (GButton)comp.GetChild("btnProduction");
+            m_comCostCurrency = (GComponent)comp.GetChild("comCostCurrency");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_txtName0 = (GTextField)comp.GetChild("txtName0");
+            m_txtName1 = (GTextField)comp.GetChild("txtName1");
+            m_txtName2 = (GTextField)comp.GetChild("txtName2");
+            m_txtName3 = (GTextField)comp.GetChild("txtName3");
+            m_txtName4 = (GTextField)comp.GetChild("txtName4");
+            m_txtGong = (GTextField)comp.GetChild("txtGong");
+            m_txtShang = (GTextField)comp.GetChild("txtShang");
+            m_txtJue = (GTextField)comp.GetChild("txtJue");
+            m_txtZhi = (GTextField)comp.GetChild("txtZhi");
+            m_skillCountText = (GTextField)comp.GetChild("skillCountText");
+            m_skillIcon = (GLoader)comp.GetChild("skillIcon");
+            m_timesText = (GTextField)comp.GetChild("timesText");
+            m_descText = (GTextField)comp.GetChild("descText");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnHome = (GButton)comp.GetChild("btnHome");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_hide = comp.GetTransition("hide");
+            m_show = comp.GetTransition("show");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_loaBg2 = null;
+            m_comImgCard.Dispose();
+            m_comImgCard = null;
+            m_listMaterias = null;
+            m_btnProduction = null;
+            m_comCostCurrency = null;
+            m_loaRarity = null;
+            m_txtName0 = null;
+            m_txtName1 = null;
+            m_txtName2 = null;
+            m_txtName3 = null;
+            m_txtName4 = null;
+            m_txtGong = null;
+            m_txtShang = null;
+            m_txtJue = null;
+            m_txtZhi = null;
+            m_skillCountText = null;
+            m_skillIcon = null;
+            m_timesText = null;
+            m_descText = null;
+            m_btnBack = null;
+            m_btnHome = null;
+            m_valueBar = null;
+            m_hide = null;
+            m_show = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_CardSyntheticUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_ComCardImgRes.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CardSynthetic
+{
+    public partial class UI_ComCardImgRes
+    {
+        public GComponent target;
+        public GLoader m_loaCard;
+        public const string URL = "ui://c6tzok8ouje16";
+        public const string PACKAGE_NAME = "CardSynthetic";
+        public const string RES_NAME = "ComCardImgRes";
+        private static UI_ComCardImgRes _proxy;
+
+        public static UI_ComCardImgRes Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCardImgRes();
+            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_ComCardImgRes Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCardImgRes();
+            }
+            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_loaCard = (GLoader)comp.GetChild("loaCard");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaCard = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_ComCardImgRes.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_ComImgCard.cs

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CardSynthetic
+{
+    public partial class UI_ComImgCard
+    {
+        public GComponent target;
+        public UI_ComCardImgRes m_ComCardImgRes;
+        public const string URL = "ui://c6tzok8ouje15";
+        public const string PACKAGE_NAME = "CardSynthetic";
+        public const string RES_NAME = "ComImgCard";
+        private static UI_ComImgCard _proxy;
+
+        public static UI_ComImgCard Create(GObject gObject = null)
+        {
+            var ui = new UI_ComImgCard();
+            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_ComImgCard Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComImgCard();
+            }
+            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_ComCardImgRes = (UI_ComCardImgRes)UI_ComCardImgRes.Create(comp.GetChild("ComCardImgRes"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ComCardImgRes.Dispose();
+            m_ComCardImgRes = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_ComImgCard.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_MateriasListItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CardSynthetic
+{
+    public partial class UI_MateriasListItem
+    {
+        public GButton target;
+        public GLoader m_loaderIcon;
+        public GTextField m_txtName;
+        public GTextField m_txtProgess;
+        public const string URL = "ui://c6tzok8ouje10";
+        public const string PACKAGE_NAME = "CardSynthetic";
+        public const string RES_NAME = "MateriasListItem";
+        private static UI_MateriasListItem _proxy;
+
+        public static UI_MateriasListItem Create(GObject gObject = null)
+        {
+            var ui = new UI_MateriasListItem();
+            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_MateriasListItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MateriasListItem();
+            }
+            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_loaderIcon = (GLoader)comp.GetChild("loaderIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtProgess = (GTextField)comp.GetChild("txtProgess");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaderIcon = null;
+            m_txtName = null;
+            m_txtProgess = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_MateriasListItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs

@@ -14,14 +14,15 @@ namespace UI.ClothingSynthetic
         public GGraph m_posHelper;
         public UI_CompItemInfo m_compItemInfo;
         public GTextField m_txtSuitName;
-        public GTextField m_txtProgress;
         public GList m_listMaterias;
         public GList m_listClothing;
         public GButton m_btnProduction;
         public GComponent m_comCostCurrency;
+        public GTextField m_txtProgress;
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GComponent m_valueBar;
+        public GButton m_cardSyntheticBtn;
         public Transition m_hide;
         public Transition m_show;
         public const string URL = "ui://4f294tdkj5391";
@@ -78,14 +79,15 @@ namespace UI.ClothingSynthetic
             m_posHelper = (GGraph)comp.GetChild("posHelper");
             m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
             m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
-            m_txtProgress = (GTextField)comp.GetChild("txtProgress");
             m_listMaterias = (GList)comp.GetChild("listMaterias");
             m_listClothing = (GList)comp.GetChild("listClothing");
             m_btnProduction = (GButton)comp.GetChild("btnProduction");
             m_comCostCurrency = (GComponent)comp.GetChild("comCostCurrency");
+            m_txtProgress = (GTextField)comp.GetChild("txtProgress");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_cardSyntheticBtn = (GButton)comp.GetChild("cardSyntheticBtn");
             m_hide = comp.GetTransition("hide");
             m_show = comp.GetTransition("show");
         }
@@ -100,14 +102,15 @@ namespace UI.ClothingSynthetic
             m_compItemInfo.Dispose();
             m_compItemInfo = null;
             m_txtSuitName = null;
-            m_txtProgress = null;
             m_listMaterias = null;
             m_listClothing = null;
             m_btnProduction = null;
             m_comCostCurrency = null;
+            m_txtProgress = null;
             m_btnBack = null;
             m_btnHome = null;
             m_valueBar = null;
+            m_cardSyntheticBtn = null;
             m_hide = null;
             m_show = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b68bf69a6d9e534aa05f083da6deb44
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_Button123.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingUpgrade
+{
+    public partial class UI_Button123
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://n7cyoafqxfkim";
+        public const string PACKAGE_NAME = "ClothingUpgrade";
+        public const string RES_NAME = "Button123";
+        private static UI_Button123 _proxy;
+
+        public static UI_Button123 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button123();
+            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_Button123 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button123();
+            }
+            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_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_Button123.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingAnsweringUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingUpgrade
+{
+    public partial class UI_ClothingAnsweringUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GTextField m_txtAnswerNum;
+        public GTextField m_txtContent;
+        public GList m_listResult;
+        public GButton m_btnBack;
+        public const string URL = "ui://n7cyoafqxfkih";
+        public const string PACKAGE_NAME = "ClothingUpgrade";
+        public const string RES_NAME = "ClothingAnsweringUI";
+        private static UI_ClothingAnsweringUI _proxy;
+
+        public static UI_ClothingAnsweringUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ClothingAnsweringUI();
+            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_ClothingAnsweringUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ClothingAnsweringUI();
+            }
+            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 = (GLoader)comp.GetChild("bg");
+            m_txtAnswerNum = (GTextField)comp.GetChild("txtAnswerNum");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_listResult = (GList)comp.GetChild("listResult");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_txtAnswerNum = null;
+            m_txtContent = null;
+            m_listResult = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingAnsweringUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingSelectUI.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingUpgrade
+{
+    public partial class UI_ClothingSelectUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GGraph m_bgEffect;
+        public GLoader m_roleIcon;
+        public GLoader m_afuIcon;
+        public GList m_selectList;
+        public GTextField m_descText;
+        public GGraph m_birdEffect;
+        public GButton m_btnBack;
+        public const string URL = "ui://n7cyoafqckqp0";
+        public const string PACKAGE_NAME = "ClothingUpgrade";
+        public const string RES_NAME = "ClothingSelectUI";
+        private static UI_ClothingSelectUI _proxy;
+
+        public static UI_ClothingSelectUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ClothingSelectUI();
+            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_ClothingSelectUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ClothingSelectUI();
+            }
+            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 = (GLoader)comp.GetChild("bg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_roleIcon = (GLoader)comp.GetChild("roleIcon");
+            m_afuIcon = (GLoader)comp.GetChild("afuIcon");
+            m_selectList = (GList)comp.GetChild("selectList");
+            m_descText = (GTextField)comp.GetChild("descText");
+            m_birdEffect = (GGraph)comp.GetChild("birdEffect");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_bgEffect = null;
+            m_roleIcon = null;
+            m_afuIcon = null;
+            m_selectList = null;
+            m_descText = null;
+            m_birdEffect = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingSelectUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingUpgradeUI.cs

@@ -0,0 +1,116 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingUpgrade
+{
+    public partial class UI_ClothingUpgradeUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GLoader m_bg;
+        public GComponent m_item0;
+        public GComponent m_item1;
+        public GComponent m_item2;
+        public GTextField m_desc1Text;
+        public GTextField m_desc2;
+        public GTextField m_desc2Text;
+        public GTextField m_desc3;
+        public GTextField m_desc3Text;
+        public GButton m_upgradeBtn;
+        public GButton m_levelUpBtn;
+        public GTextField m_finish;
+        public GTextField m_unLockText;
+        public GButton m_btnBack;
+        public const string URL = "ui://n7cyoafqckqp4";
+        public const string PACKAGE_NAME = "ClothingUpgrade";
+        public const string RES_NAME = "ClothingUpgradeUI";
+        private static UI_ClothingUpgradeUI _proxy;
+
+        public static UI_ClothingUpgradeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ClothingUpgradeUI();
+            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_ClothingUpgradeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ClothingUpgradeUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_item0 = (GComponent)comp.GetChild("item0");
+            m_item1 = (GComponent)comp.GetChild("item1");
+            m_item2 = (GComponent)comp.GetChild("item2");
+            m_desc1Text = (GTextField)comp.GetChild("desc1Text");
+            m_desc2 = (GTextField)comp.GetChild("desc2");
+            m_desc2Text = (GTextField)comp.GetChild("desc2Text");
+            m_desc3 = (GTextField)comp.GetChild("desc3");
+            m_desc3Text = (GTextField)comp.GetChild("desc3Text");
+            m_upgradeBtn = (GButton)comp.GetChild("upgradeBtn");
+            m_levelUpBtn = (GButton)comp.GetChild("levelUpBtn");
+            m_finish = (GTextField)comp.GetChild("finish");
+            m_unLockText = (GTextField)comp.GetChild("unLockText");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_bg = null;
+            m_item0 = null;
+            m_item1 = null;
+            m_item2 = null;
+            m_desc1Text = null;
+            m_desc2 = null;
+            m_desc2Text = null;
+            m_desc3 = null;
+            m_desc3Text = null;
+            m_upgradeBtn = null;
+            m_levelUpBtn = null;
+            m_finish = null;
+            m_unLockText = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingUpgradeUI.cs.meta

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