Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
     <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="536,2227"/>
     <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="350,1972"/>
     <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1870"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10003.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
     <component id="n21_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,2212"/>
     <component id="n22_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,1972"/>
     <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,1972"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10004.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
     <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,2190"/>
     <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,1940"/>
     <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,1940"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10005.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
     <component id="n42_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,2167"/>
     <component id="n43_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,1917"/>
     <component id="n44_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,1917"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20001.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
     <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="536,2227"/>
     <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="350,1972"/>
     <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1870"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20003.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
     <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,2203"/>
     <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1963"/>
     <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1963"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20004.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
     <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,2190"/>
     <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,1940"/>
     <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,1940"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20005.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
     <component id="n42_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,2167"/>
     <component id="n43_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,1917"/>
     <component id="n44_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,1917"/>

FGUIProject/assets/Main/package.xml

@@ -158,7 +158,6 @@
     <component id="d4iw6o" name="ButtonToggle.xml" path="/components/"/>
     <component id="d4iw6p" name="ButtonHelp.xml" path="/components/"/>
     <component id="d4iw6q" name="GMPanelUI.xml" path="/" exported="true"/>
-    <image id="ga166r" name="zhangjie_bg2.jpg" path="/imagesStory/" atlas="alone_npot"/>
     <component id="ga166s" name="CompChapter10005.xml" path="/componentsLevel/" exported="true"/>
     <image id="tu966t" name="zx_zhez.png" path="/images/" scale="9grid" scale9grid="17,19,4,2"/>
     <component id="tu966u" name="ComponentChapterPic.xml" path="/components/"/>
@@ -382,6 +381,9 @@
     <movieclip id="wet2f3" name="MovieClip4.jta" path="/Movie/"/>
     <image id="ox5bf4" name="zjm_hdhd_3.png" path="/images/"/>
     <component id="ox5bf5" name="Button2.xml" path="/components/"/>
+    <image id="eq0bf6" name="beijing1_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
+    <image id="eq0bf7" name="beijing3_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
+    <image id="eq0bf8" name="beijing4_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -205,6 +205,7 @@ namespace GFGGame
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
             ActivitySProxy.ReqDailyLoginInfos().Coroutine();
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
+            MailSProxy.ReqMailCount().Coroutine();
             EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
             EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED) <= 1 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED);
             GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;

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

@@ -133,6 +133,7 @@ namespace GFGGame
 
         public static void Logout()
         {
+            GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession?.Dispose();
             GameGlobal.zoneScene.GetComponent<SessionComponent>().Session?.Dispose();
         }
 

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

@@ -95,7 +95,7 @@ namespace ET
             {
                 zoneScene.AddComponent<SessionComponent>();
             }
-            zoneScene.GetComponent<SessionComponent>().Session = accountSession;
+            zoneScene.GetComponent<SessionComponent>().AccountSession = accountSession;
             accountSession.AddComponent<PingComponent>();
             accountSession.AddComponent<DisConnectedCompnent>();
             AccountInfoComponent accountInfoComponent = zoneScene.GetComponent<AccountInfoComponent>();
@@ -138,7 +138,7 @@ namespace ET
 
             try
             {
-                a2C_GetServerInfos = (A2C_GetServerInfos)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_GetServerInfos()
+                a2C_GetServerInfos = (A2C_GetServerInfos)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetServerInfos()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token
@@ -173,7 +173,7 @@ namespace ET
 
             try
             {
-                a2C_GetRoles = (A2C_GetRoles)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_GetRoles()
+                a2C_GetRoles = (A2C_GetRoles)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetRoles()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -208,7 +208,7 @@ namespace ET
             A2C_CreateRole a2C_CreateRole = null;
             try
             {
-                a2C_CreateRole = (A2C_CreateRole)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_CreateRole
+                a2C_CreateRole = (A2C_CreateRole)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_CreateRole
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -241,7 +241,7 @@ namespace ET
 
             try
             {
-                a2C_DeleteRole = (A2C_DeleteRole)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_DeleteRole()
+                a2C_DeleteRole = (A2C_DeleteRole)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_DeleteRole()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -274,7 +274,7 @@ namespace ET
 
             try
             {
-                a2C_GetRealmKey = (A2C_GetRealmKey)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_GetRealmKey()
+                a2C_GetRealmKey = (A2C_GetRealmKey)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetRealmKey()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -395,7 +395,7 @@ namespace ET
             A2C_GetLatestNotice response = null;
             try
             {
-                response = (A2C_GetLatestNotice)await GameGlobal.zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_GetLatestNotice());
+                response = (A2C_GetLatestNotice)await GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetLatestNotice());
             }
             catch (Exception e)
             {

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Session/SessionComponentSystem.cs

@@ -4,14 +4,17 @@
 	{
 		public override void Destroy(SessionComponent self)
 		{
-			self.Session.Dispose();
+			self.AccountSession?.Dispose();
+			self.Session?.Dispose();
 		}
 	}
 
 	public static class SessionComponentComponent
     {
 		public static void Disconnect(this SessionComponent self)
-        {
+		{
+			self.AccountSession?.GetComponent<DisConnectedCompnent>()?.CancelAlert();
+			self.AccountSession?.Dispose();
 			self.Session?.GetComponent<DisConnectedCompnent>()?.CancelAlert();
 			self.Session?.Dispose();
 		}

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/Session/SessionComponent.cs

@@ -2,6 +2,9 @@
 {
 	public class SessionComponent: Entity, IAwake, IDestroy
 	{
+		//登录会话
+		public Session AccountSession;
+		//游戏会话
 		public Session Session;
 	}
 }

GameClient/Assets/Game/HotUpdate/ServerProxy/MailSProxy.cs

@@ -85,8 +85,8 @@ namespace GFGGame
         }
         public static async ETTask<bool> ReqMailReward(long mailId)
         {
-            Mail2C_GetMailItems response = null;
-            response = (Mail2C_GetMailItems)await MessageHelper.SendToServer(new C2Mail_GetMailItems() { MailId = mailId });
+            M2C_GetMailItems response = null;
+            response = (M2C_GetMailItems)await MessageHelper.SendToServer(new C2M_GetMailItems() { MailId = mailId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -119,8 +119,8 @@ namespace GFGGame
         }
         public static async ETTask<bool> ReqAllMailRewards()
         {
-            Mail2C_GetAllMailItems response = null;
-            response = (Mail2C_GetAllMailItems)await MessageHelper.SendToServer(new C2Mail_GetAllMailItems());
+            M2C_GetAllMailItems response = null;
+            response = (M2C_GetAllMailItems)await MessageHelper.SendToServer(new C2M_GetAllMailItems());
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

GameClient/Assets/ResIn/UI/Main/Main_atlas_ga166r.png.meta → GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf6.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 460ef13ce59fa9a4fb84e6bb1dc04b46
+guid: c86bbf81920b10c47afed01dfc71ad42
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1

GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf7.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7f8606126acb3b443910e38ca77e8553
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf8.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 8818bf085b75c1d46ae5ab6f884f6fa1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: