DGJ 4 luni în urmă
părinte
comite
15e4e40f98

+ 18 - 18
Assets/FrameWork/Error.prefab

@@ -105,8 +105,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6454015529303296040}
   - {fileID: 7302531781681643721}
+  - {fileID: 6454015529303296040}
   - {fileID: 3337330565829083507}
   m_Father: {fileID: 5151252279887212288}
   m_RootOrder: 0
@@ -236,8 +236,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 187, y: -199.0282}
-  m_SizeDelta: {x: 374, y: 70}
+  m_AnchoredPosition: {x: 187, y: -286.6108}
+  m_SizeDelta: {x: 374, y: 105.1652}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4418060569220192962
 CanvasRenderer:
@@ -274,16 +274,16 @@ RectTransform:
   m_GameObject: {fileID: 4435525117585990493}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4624518738182961917}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -59, y: -23.8}
-  m_SizeDelta: {x: 62, y: 34}
+  m_AnchoredPosition: {x: -95.9, y: -33.2}
+  m_SizeDelta: {x: 840, y: 336}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1912919924402345294
 CanvasRenderer:
@@ -313,7 +313,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8fb40c7bfa669bf4b86e3ee5be0f21c7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dfbf17f4f8b18da429683be1cb212c8a, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -340,7 +340,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3337330565829083507
 RectTransform:
   m_ObjectHideFlags: 0
@@ -358,7 +358,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -58.4673}
+  m_AnchoredPosition: {x: 0, y: -81.3}
   m_SizeDelta: {x: 200, y: 26.9347}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &482809723720585132
@@ -1144,7 +1144,7 @@ MonoBehaviour:
     m_Left: 0
     m_Right: 0
     m_Top: 0
-    m_Bottom: 0
+    m_Bottom: 10
   m_ChildAlignment: 0
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
@@ -1434,16 +1434,16 @@ RectTransform:
   m_GameObject: {fileID: 5569661734627454462}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4624518738182961917}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 51.9, y: -23.8}
-  m_SizeDelta: {x: 62, y: 34}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 89.1, y: -33.199997}
+  m_SizeDelta: {x: 740, y: 236}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2211651981779038775
 CanvasRenderer:
@@ -1473,7 +1473,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8fb40c7bfa669bf4b86e3ee5be0f21c7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4e240c9d325fef74a86d73051aef48de, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 1 - 1
Assets/FrameWork/ProjectManager/Demo.prefab

@@ -2586,7 +2586,7 @@ RectTransform:
   m_GameObject: {fileID: 855691858741328281}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6787450879839044863}

BIN
Assets/FrameWork/Texture/数字/Component 5@3x (1).png


+ 147 - 0
Assets/FrameWork/Texture/数字/Component 5@3x (1).png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: dfbf17f4f8b18da429683be1cb212c8a
+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: 0
+    wrapV: 0
+    wrapW: 0
+  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: 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: 

BIN
Assets/FrameWork/Texture/数字/Component 6@1x.png


+ 147 - 0
Assets/FrameWork/Texture/数字/Component 6@1x.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 4e240c9d325fef74a86d73051aef48de
+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: 0
+    wrapV: 0
+    wrapW: 0
+  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: 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: 

+ 5 - 1
Assets/HotUpdate/Scripts/Scripts/JinRuRenwu.cs

@@ -234,22 +234,26 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
                     case 1:
                         isshow = true;
                         ImageBT.SetActive(true);
-                        showImage();
+                        Image.transform.parent.gameObject.SetActive(true);
                         if (img == 0)
                         {
                             Image.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
+                            Image.SetActive(true);
                         }
                         else if (img == 1)
                         {
 
                             Image2.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
+                            Image2.SetActive(true);
                         }
                         else if (img == 2)
                         {
 
                             Image3.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
+                            Image3.SetActive(true);
                         }
                         img++;
+                       // showImage();
                         break;
                     case 2:
                         isshow = true;

+ 11 - 2
Assets/HotUpdate/Scripts/Scripts/Project/DaoHang/Managers/BladeServerManager.cs

@@ -144,6 +144,7 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
 
             TagTracking tagTracking2 = tag.GetComponent<TagTracking>();
             tag.GetComponent<TrackingEvent>().onTrackingEnter.AddListener(() => { OnTrackingFound(tagTracking2); });
+            tag.GetComponent<TrackingEvent>().onTrackingExit.AddListener(() => { OnTrackingLost(tagTracking2); });
         }
        
     }
@@ -365,8 +366,16 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
 
     public void OnTrackingLost(TagTracking tracking)
     {
-        //if (tracking.TrackId == foundTag.TrackId)
-        //    foundItem = null;
+        if (tracking.TrackId == 6 || tracking.TrackId == 15 || tracking.TrackId == 26)
+        {
+            if (ProjectALLStateManager.Instance.isAIDevice)
+            {
+                AIDeviceManager.Instance.DeviceIdExit(tracking.TrackId);
+            }
+
+            return;
+        }
+
     }
 
     private void StartTracking(TagTracking tracking)

+ 35 - 1
Assets/HotUpdate/Scripts/Scripts/Project/Demo/AIDeviceManager.cs

@@ -37,14 +37,21 @@ public class AIDeviceManager : MonoSingleton<AIDeviceManager>
     {
         if (ProjectALLStateManager.Instance != null)
             ProjectALLStateManager.Instance.isAIDevice = false;
-    }
+        oldTarkingId = -1;
+        ishumidity = false;
+        isnoise = false;
+        isoscillate = false;
 
+    }   
+        
     private void Update()
     {
+#if UNITY_EDITOR
         if (Input.GetKeyDown(KeyCode.P))
         {
             DeviceIdentification(6);
         }
+#endif
     }
     public void DeviceIdentification(int id)
     {
@@ -141,6 +148,7 @@ public class AIDeviceManager : MonoSingleton<AIDeviceManager>
                             oscillateControl.gameObject.SetActive(true);
                             aIDeviceAlarmControl.gameObject.SetActive(false);
                             isoscillate = true;
+
                         }
                     });
 
@@ -216,6 +224,7 @@ public class AIDeviceManager : MonoSingleton<AIDeviceManager>
                             oscillateControl.gameObject.SetActive(false);
                             aIDeviceAlarmControl.gameObject.SetActive(false);
                             isnoise = true;
+                      
 
                         }
                     });
@@ -238,6 +247,31 @@ public class AIDeviceManager : MonoSingleton<AIDeviceManager>
         // Http ÇëÇó¶ÔÓ¦²ÎÊý
     }
 
+    public void DeviceIdExit(int id)
+    {
+        if(oldTarkingId == id)
+        {
+            switch (id)
+            {
+                case 26:
+                   // ishumidity = false;
+                    humitureControl.gameObject.SetActive(false);
+                    break;
+                case 15:
+                 //   isoscillate = false;
+                    oscillateControl.gameObject.SetActive(false);
+                    break;
+                case 6:
+                   // isnoise = false;
+                    noiseControl.gameObject.SetActive(false);
+                    break;
+                default:
+                    break;
+            }
+            oldTarkingId = -1;
+            deviceSaoMiao.SetActive(true);
+        }
+    }
     public void Received(string Msg)
     {
        

+ 14 - 14
Assets/HotUpdate/Scripts/Scripts/Project/Demo/HumitureControl.cs

@@ -46,12 +46,12 @@ public class HumitureControl : MonoBehaviour
         this.humitureData.AlarmState = data.AlarmState;
         switch (data.initiateState)
         {
-            case "禁用":
-                initiateText.text = "禁用";
+            case "绂佺敤":
+                initiateText.text = "绂佺敤";
                 initiateText.color = Color.white;
                 break;
-            case "启用":
-                initiateText.text = "启用";
+            case "鍚�敤":
+                initiateText.text = "鍚�敤";
                 initiateText.color = new Color32(22, 93, 255, 255);
                 break;
 
@@ -61,18 +61,18 @@ public class HumitureControl : MonoBehaviour
 
         switch (data.onLineState)
         {
-            case "离线":
-                onLineText.text = "离线";
+            case "绂荤嚎":
+                onLineText.text = "绂荤嚎";
                 onLineText.color = new Color32(79, 79, 79, 255);
                 onLineImage.color = new Color32(79, 79, 79, 255);
                 break;
-            case "在线":
-                onLineText.text = "在线";
+            case "鍦ㄧ嚎":
+                onLineText.text = "鍦ㄧ嚎";
                 onLineText.color = new Color32(34, 187, 67, 255);
                 onLineImage.color = new Color32(34, 187, 67, 255);
                 break;
-            case "未激活":
-                onLineText.text = "未激活";
+            case "鏈�縺娲�":
+                onLineText.text = "鏈�縺娲�";
                 onLineText.color = Color.white;
                 onLineImage.color = Color.white;
                 break;
@@ -82,13 +82,13 @@ public class HumitureControl : MonoBehaviour
 
         switch (data.AlarmState)
         {
-            case "报警":
-                alarmStateText.text = "报警";
+            case "鎶ヨ�":
+                alarmStateText.text = "鎶ヨ�";
                 alarmStateImage.color = new Color32(255, 3, 7, 255);
 
                 break;
-            case "正常":
-                alarmStateText.text = "正常";
+            case "姝e父":
+                alarmStateText.text = "姝e父";
                 alarmStateImage.color = new Color32(7, 193, 96, 255);
                 break;
             default:

+ 2 - 2
Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ShowVideoManager.cs

@@ -48,7 +48,7 @@ public class ShowVideoManager : MonoBehaviour
                 if(tex!=null)
                 {
                     TimerMgr.Instance.DestroyTimer(timers);
-                    this.GetComponent<RenWuTypeWindow>().changebizhi(tex);
+                    //this.GetComponent<RenWuTypeWindow>().changebizhi(tex);
                 }
             },1f,-1);
         }
@@ -70,7 +70,7 @@ public class ShowVideoManager : MonoBehaviour
             else
             {
                 Texture tex = avpro.getTexture();
-                this.GetComponent<RenWuTypeWindow>().changebizhi(tex);
+               // this.GetComponent<RenWuTypeWindow>().changebizhi(tex);
                 plbt.SetActive(false);
                 avpro.Play();
             }

+ 11 - 11
Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoWindow.cs

@@ -99,17 +99,17 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
     public override void OnEnable()
     {
         base.OnEnable();
-        //if(uiScroll)
-        //{
-        //    Debug.Log("HHHHHHHHHHHHGGGGGGGGGGGGGGG");
-        //    isExit = false;
-        //    RemoveAll();
-        //    refList();
-        //    uiScroll.onUpdateItem -= ContentUpdateItem;
-        //    uiScroll.onUpdateItem += ContentUpdateItem;
-
-        //}
-       
+        if (uiScroll)
+        {
+            Debug.Log("HHHHHHHHHHHHGGGGGGGGGGGGGGG");
+            isExit = false;
+            RemoveAll();
+            refList();
+            uiScroll.onUpdateItem -= ContentUpdateItem;
+            uiScroll.onUpdateItem += ContentUpdateItem;
+
+        }
+
     }
 
 

+ 2 - 1
Assets/LangChaoModel/Scripts/HttpToolLangChao.cs

@@ -35,7 +35,8 @@ public class HttpToolLangChao : MonoSingleton<HttpToolLangChao>
         requestHeader.Clear();
         if (Singleton<RTCInfo>.Instance.Token != "" && Singleton<RTCInfo>.Instance.Token != null)
         {
-            requestHeader.Add("x-token", Singleton<RTCInfo>.Instance.Token);
+             requestHeader.Add("x-token", Singleton<RTCInfo>.Instance.Token);
+            //requestHeader.Add("x-token", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjQ4NzQxMTY1MDIsImlhdCI6MTcyMDUxNjUwMiwidXNlciI6eyJpZCI6MTA5MiwiZW1haWwiOiIiLCJwaG9uZSI6InprZGVtbyIsIm5hbWUiOiJ6a2RlbW8iLCJyb2xlSWQiOjF9fQ.OZ2HDUp9F5S504cmCUh7Ai15sq_nQ5i7ZG_odxhqGGM");
             requestHeader.Add("authorization", Singleton<RTCInfo>.Instance.Token);
         }