Merge branch 'master' of http://115.29.205.206/kimoji/ET

DotNet/Hotfix/Scenes/Game/Room/HGHuangHuangComponentSystem.cs

@@ -33,6 +33,9 @@ namespace ET.Server
                 self.CanPgIds = new List<Player>();
                 self.OperableList = new List<Player>();
                 self.ClickHuIds = new List<Player>();
+                self.CanPgIds = new List<Player>();
+                self.OperableList = new List<Player>();
+                self.ClickHuIds = new List<Player>();
                 self.CardList = new List<int>();
                 self.UpdateTime = 0;
                 
@@ -210,7 +213,8 @@ namespace ET.Server
             int rand2 = RandomGenerator.RandomNumber(1, 7);
             self.Rand = new[] { rand1, rand2 };
             // 定庄
-            self.ZhuangPos = (rand1 + rand2) % 4;
+            // self.ZhuangPos = (rand1 + rand2) % 4;
+            self.ZhuangPos = (rand1 + rand2) % room.MaxNum;
             // 设置当前操作玩家
             self.CurrentPlayer = self.Players[self.ZhuangPos];
             // 设置当前摸牌玩家

DotNet/Hotfix/Scenes/Game/Room/RoomSystem.cs

@@ -140,10 +140,13 @@ namespace ET.Server
         {
             int[] nextPos = pos switch
             {
-                3 => new [] { 0, 1, 2 },
-                2 => new [] { 3, 0, 1 },
-                1 => new [] { 2, 3, 0 },
-                0 => new [] { 1, 2, 3 },
+                // 3 => new [] { 0, 1, 2 },
+                // 2 => new [] { 3, 0, 1 },
+                // 1 => new [] { 2, 3, 0 },
+                // 0 => new [] { 1, 2, 3 },
+                // todo 正式版此处改为4人
+                1 => new [] { 0 },
+                0 => new [] { 1 },
                 _ => null
             };
             return nextPos;

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/CommonProto_CS_10001.cs.meta

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

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/OuterMessage_C_30001.cs.meta

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