提交一波。。。。

Unity/Assets/Bundles/UI/UIMessage.prefab

@@ -513,7 +513,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5BA2\u670D\u5FAE\u4FE1\uFF1A88888888"
+  m_Text: "\u6CA1\u6709\u6D88\u606F"
 --- !u!1 &7217891965057804843
 GameObject:
   m_ObjectHideFlags: 0

Unity/Assets/Res/UI/Altas/CommonAtlas/common_clock_bg.png.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 2734cd5e4fdbc774dafc74d180ced977
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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
+  ignoreMasterTextureLimit: 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: 0
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    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: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIMain/UIMainComponentSystem.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using UnityEditor.PackageManager;
 using UnityEngine;
 using UnityEngine.UI;
 

Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIStartFightRoom/UIStartFightRoomComponentSystem.cs

@@ -5,8 +5,6 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.PlayerLoop;
 using UnityEngine.UI;
-using static System.Net.Mime.MediaTypeNames;
-using static UnityEditor.Progress;
 
 namespace ET.Client
 {
@@ -191,9 +189,9 @@ namespace ET.Client
             CommonBridge.Instance.dispathPush += DispathPush;
             self.readyBtn.SetActive(true);
             self.inviteBtn.SetActive(true);
-            self.houseIdTxt.GetComponent<UnityEngine.UI.Text>().text = startFightRoomInfo.roomInfo.RoomId.ToString();
-            self.gameNumTxt.GetComponent<UnityEngine.UI.Text>().text = startFightRoomInfo.roomInfo.OwnerId.ToString();
-            self.curResidueTxt.GetComponent<UnityEngine.UI.Text>().text = "0";
+            self.houseIdTxt.GetComponent<Text>().text = startFightRoomInfo.roomInfo.RoomId.ToString();
+            self.gameNumTxt.GetComponent<Text>().text = startFightRoomInfo.roomInfo.OwnerId.ToString();
+            self.curResidueTxt.GetComponent<Text>().text = "0";
             await SoundManager.Instance.PlaySound("common_playing", true);
         }
 
@@ -334,27 +332,34 @@ namespace ET.Client
                             GameObjectPool.Instance.ClearRealySelCardList();
 
                             //抬起
-                            for (int i = 0; i < myCardInfo.cardInfo.ActInfo.Count; i++)
+                            if (myCardInfo.cardInfo != null && myCardInfo.cardInfo.ActInfo != null && myCardInfo.cardInfo.ActInfo.Count > 0)
                             {
-                                //根据服务器信息 弹起响应的牌
-                                DisCardPushWithOperator(parentNode.transform, myCardInfo.cardInfo.ActInfo[i]);
+                                for (int i = 0; i < myCardInfo.cardInfo.ActInfo.Count; i++)
+                                {
+                                    //根据服务器信息 弹起响应的牌
+                                    DisCardPushWithOperator(parentNode.transform, myCardInfo.cardInfo.ActInfo[i]);
+                                }
                             }
+                            
                             //记录当前出的牌
                             startFightRoomComponentUI.curCardVal = startFightRoomInfo.roomInfo.CurDisCard;
                             Log.Error("当前出的牌: " + startFightRoomComponentUI.curCardVal);
                         }
 
-                        //处理每个回合倒计时
-                        Log.Error("当前自己回合");
-                        startFightRoomComponentUI.startTimeCount = startFightRoomInfo.roomInfo.Time;
-                        if (startFightRoomComponentUI.startTimer > 0)
+                        if (startFightRoomInfo.roomInfo.Time > 0)
                         {
-                            startFightRoomComponentUI.timeCountTxt.text = "";
-                            TimerComponent.Instance?.Remove(ref startFightRoomComponentUI.startTimer);
+                            startFightRoomComponentUI.startTimeCount = startFightRoomInfo.roomInfo.Time;
+                            startFightRoomComponentUI.startTimer = TimerComponent.Instance.NewRepeatedTimer(ConstValue.fightTimeRefreshTime / 2 + 100, TimerInvokeType.startFightTimeCount, startFightRoomComponentUI);
+                        }
+                        else
+                        {
+                            Log.Error("清空回合倒计时");
+                            if (startFightRoomComponentUI.startTimer > 0)
+                            {
+                                startFightRoomComponentUI.timeCountTxt.text = "";
+                                TimerComponent.Instance?.Remove(ref startFightRoomComponentUI.startTimer);
+                            }
                         }
-                        startFightRoomComponentUI.startTimer = TimerComponent.Instance.NewRepeatedTimer(ConstValue.fightTimeRefreshTime / 2 + 100, TimerInvokeType.startFightTimeCount, startFightRoomComponentUI);
-                        //处理当前操作玩家的状态显示
-                        RefreshCenterOperationState(startFightRoomInfo.roomInfo.OpPos, startFightRoomComponentUI);
                         break;
                     }
             }
@@ -889,7 +894,19 @@ namespace ET.Client
                         }
                     }
                 }
-            } 
+            }
+
+            //处理每个回合倒计时
+            Log.Error("当前自己回合");
+            startFightRoomComponentUI.startTimeCount = roomInfo.Time;
+            if (startFightRoomComponentUI.startTimer > 0)
+            {
+                startFightRoomComponentUI.timeCountTxt.text = "";
+                TimerComponent.Instance?.Remove(ref startFightRoomComponentUI.startTimer);
+            }
+            startFightRoomComponentUI.startTimer = TimerComponent.Instance.NewRepeatedTimer(ConstValue.fightTimeRefreshTime / 2 + 100, TimerInvokeType.startFightTimeCount, startFightRoomComponentUI);
+            //处理当前操作玩家的状态显示
+            RefreshCenterOperationState(roomInfo.OpPos, startFightRoomComponentUI);
         }
 
         //刷新中间表示当前操作玩家

Unity/Assets/Scripts/Codes/Model/Client/GameUtil.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using UnityEngine;
-using static UnityEditor.Experimental.GraphView.GraphView;
 
 namespace ET
 {

Unity/Assets/Scripts/Codes/ModelView/Client/Demo/UI/UIStartFightRoom/UIStartFightRoomComponent.cs

@@ -77,6 +77,7 @@ namespace ET.Client
 
         public long startTimer;
         public long startTimeCount = 0; //用于开始倒计时，以及每个回合倒计时
+
         public int curCardVal = -1;
     }
 }

Unity/打包流程.txt

@@ -0,0 +1,14 @@
+# 打包过程
+1. 点击HybridCLR -> Installer，点击安装，等待安装完成
+
+2. 点击Unity菜单 -> ET -> ChangeDefine -> remove enable codes
+
+3. 点击Unity菜单 -> ET -> buildModelAnd Hotfix
+
+4. 点击HybridCLR -> generate  -> all
+
+5.点击Unity菜单 -> ET -> BuildPackage
+
+6. 点击HybridCLR -> copyAotDlls
+
+7.点击Unity菜单 -> ET -> BuildPackage