Browse Source

修改客户端在加载好战斗场景时,向战斗服发送一个Notify,作为战斗的开端

大爷 1 year ago
parent
commit
8d1a8ebb5b

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/AIConfigCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0ce8e5cdc2a99ea4f89d259ed7e4a60a
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/CharacterCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 56b380f95a382ca47b157caf04473b23
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/ItemIdConfigCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e42d3ee868f8836449ae8af67f104213
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/ItemTypeConfigCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a1f700982538903428f54fbd2d45d66a
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/MapConfigCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e093c2d3d36a484429a12e94b35988bb
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/MonsterCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ee066fd7d87f22841976e661a5293082
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/SkillConfigCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dcc7f4c771051224399b546b925b2fe6
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/UnitConfigCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 87c7e5aaf7231aa4f93ac95e494e71f9
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity/Assets/Res/Config/GenFromExcel/UpLevelExpCategory.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 16646337c9d119c47b40cef592d5d45e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 3
Unity/Assets/Scripts/Codes/Hotfix/Client/Login/EnterMapHelper.cs

@@ -9,7 +9,8 @@ namespace ET.Client
             try
             {
                 var param = new C2G_EnterMap() { InstanceId = scnInstanceId };
-                G2C_EnterMap g2CEnterMap = await clientScene.GetComponent<SessionComponent>().Session.Call(param) as G2C_EnterMap;
+                var session = clientScene.GetComponent<SessionComponent>().Session;
+                G2C_EnterMap g2CEnterMap = await session.Call(param) as G2C_EnterMap;
                 if(g2CEnterMap.Error != 0)
                 {
                     //TODO: Error处理
@@ -28,9 +29,10 @@ namespace ET.Client
                 // 等待场景切换完成
                 await clientScene.GetComponent<ObjectWait>().Wait<Wait_SceneChangeFinish>();
 
-                Log.Debug("tell bat svr i'm ready.");
                 //告诉战斗服 i am ready
-                clientScene.GetComponent<SessionComponent>().Session.Send(new BattleClientReady());
+                session.Send(new BattleClientReady());
+
+                session.Call(new C2G_BattleNotify() { Message = BattleNotify.ClientIsReady.ToString() }).Coroutine();
             }
             catch (Exception e)
             {

+ 11 - 0
Unity/Assets/Scripts/Codes/Model/Client/Generate/Config/MapConfig.cs.meta

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

+ 11 - 0
Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/BattleServerMsg_CS_40001.cs.meta

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

+ 8 - 8
Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/OuterMessage_C_10001.cs

@@ -727,22 +727,22 @@ namespace ET
 
 	}
 
-	[ResponseType(nameof(G2C_GameStart))]
-	[Message(OuterMessage.C2G_GameStart)]
+	[ResponseType(nameof(G2C_BattleNotify))]
+	[Message(OuterMessage.C2G_BattleNotify)]
 	[ProtoContract]
-	public partial class C2G_GameStart: ProtoObject, IRequest
+	public partial class C2G_BattleNotify: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 		[ProtoMember(2)]
-		public string NameType { get; set; }
+		public string Message { get; set; }
 
 	}
 
-	[Message(OuterMessage.G2C_GameStart)]
+	[Message(OuterMessage.G2C_BattleNotify)]
 	[ProtoContract]
-	public partial class G2C_GameStart: ProtoObject, IResponse
+	public partial class G2C_BattleNotify: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -806,7 +806,7 @@ namespace ET
 		 public const ushort R2C_Disconnect = 10048;
 		 public const ushort HttpDouyinApiCallbackResponse = 10049;
 		 public const ushort HttpGetVersionResponse = 10050;
-		 public const ushort C2G_GameStart = 10051;
-		 public const ushort G2C_GameStart = 10052;
+		 public const ushort C2G_BattleNotify = 10051;
+		 public const ushort G2C_BattleNotify = 10052;
 	}
 }

+ 11 - 0
Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/OuterMessage_C_10001.cs.meta

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

+ 11 - 0
Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/PlayerProto_CS_30001.cs.meta

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

+ 6 - 0
Unity/Assets/Scripts/Codes/Model/Share/Const/ConstValue.cs

@@ -14,5 +14,11 @@
         FastStreamPush = 1,
         BattleClear
     }
+
+    public enum BattleNotify
+    {
+        ClientIsReady,
+
+    }
 }