降低组列表的Drallcall

Assets/Art/GameEnd/bar_base.png.meta

@@ -21,7 +21,7 @@ TextureImporter:
     heightScale: 0.25
     normalMapFilter: 0
     flipGreenChannel: 0
-  isReadable: 0
+  isReadable: 1
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
@@ -71,7 +71,7 @@ TextureImporter:
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0

Assets/Art/GameEnd/圆.png.meta

+fileFormatVersion: 2
+guid: f3a23023775d5604cbae05a554da8bce
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+    flipGreenChannel: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 4
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials/UIWave.mat

@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
   stringTagMap: {}
@@ -56,13 +56,13 @@ Material:
     - _EnableExternalAlpha: 0
     - _QueueControl: 1
     - _QueueOffset: 0
-    - progress: 0.2
+    - progress: 0.535
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Flip: {r: 1, g: 1, b: 1, a: 1}
     - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
-    - color1: {r: 0.9150943, g: 0.18560876, b: 0.18560876, a: 1}
-    - color2: {r: 1, g: 1, b: 1, a: 1}
+    - color1: {r: 0.6901961, g: 0.64705884, b: 0.6117647, a: 0.003921569}
+    - color2: {r: 0.8901961, g: 0.7345588, b: 0.68903744, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &520899111724638506
 MonoBehaviour:

Assets/Resources/SpriteAtls/Sprites.spriteatlasv2.meta

@@ -20,8 +20,8 @@ SpriteAtlasImporter:
     blockOffset: 1
     allowAlphaSplitting: 0
     enableRotation: 1
-    enableTightPacking: 1
-    enableAlphaDilation: 0
+    enableTightPacking: 0
+    enableAlphaDilation: 1
   secondaryTextureSettings: {}
   variantMultiplier: 1
   bindAsDefault: 1

Assets/Resources/perfabs/GameMgr.prefab

@@ -178,7 +178,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 658c6ece9bc787940918e4b7f413a037, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: -1
+  roomId: -1
   Text: {fileID: 1434280649147581400}
 --- !u!114 &1434280649147581400
 MonoBehaviour:
@@ -5420,7 +5420,9 @@ MonoBehaviour:
   key: 
   png: {fileID: 0}
   jpg: {fileID: 0}
+  map: {fileID: 0}
   json:
+    isInit: 0
     roomDatas: []
     roomGroupsData: []
     colorDiff: 0
@@ -5751,12 +5753,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c99b850a1f8be4640b391afdbd751ee8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  bigArea: 0
   roomId: -1
   groupId: -1
   IsUse: -1
   SP: {fileID: 7114594662145661671}
   Rect: {fileID: 3859749812772851665}
   SPRect: {fileID: 4668905872759166448}
+  size: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &5487798596680419126
 GameObject:
   m_ObjectHideFlags: 0
@@ -5892,6 +5896,7 @@ MonoBehaviour:
   tiMgr: {fileID: 1490190831900560014}
   eiMgr: {fileID: 3661810172065829162}
   gray: {fileID: 2800000, guid: cfe63fc6a2e3edc409d653cefd205fb7, type: 3}
+  saveTime: -1
 --- !u!114 &977886392249047969
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/perfabs/gameAreaGroupItem.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1774387561720259315
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8315499110496964167}
+  - component: {fileID: 553671693112746553}
+  - component: {fileID: 7670498228395355509}
+  - component: {fileID: 5122731428575164473}
+  m_Layer: 5
+  m_Name: Wave
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8315499110496964167
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1774387561720259315}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1616143210361961396}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 120, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &553671693112746553
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1774387561720259315}
+  m_CullTransparentMesh: 1
+--- !u!114 &7670498228395355509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1774387561720259315}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 2800000, guid: f3a23023775d5604cbae05a554da8bce, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!114 &5122731428575164473
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1774387561720259315}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6bfa03d1885f054459811941e40d6121, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  heightPercent: 1
+  waveHeightParame: 0.05
+  waveWidthParame: 9.23
+  speed: 6.2
+  defaultColor:
+    serializedVersion: 2
+    rgba: 0
+  waveImage: {fileID: 7670498228395355509}
+  PlayFlag: 0
 --- !u!1 &3160742059448807472
 GameObject:
   m_ObjectHideFlags: 0
@@ -87,13 +182,14 @@ GameObject:
   - component: {fileID: 7959246005771612609}
   - component: {fileID: 3349564146383497322}
   - component: {fileID: 6976011184890120279}
+  - component: {fileID: 8309725145420176580}
   m_Layer: 5
   m_Name: circle_Jindu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7959246005771612609
 RectTransform:
   m_ObjectHideFlags: 0
@@ -152,6 +248,48 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!23 &8309725145420176580
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3184293622696171059}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 0460c98b97e90f24ea3f82ae6d555f35, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &3295345382303002361
 GameObject:
   m_ObjectHideFlags: 0
@@ -363,6 +501,82 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &5313434659621491447
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8151219374067323264}
+  - component: {fileID: 5506073709958109389}
+  - component: {fileID: 7180240731222624130}
+  m_Layer: 5
+  m_Name: Image_Jindu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8151219374067323264
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5313434659621491447}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1616143210361961396}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 120, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5506073709958109389
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5313434659621491447}
+  m_CullTransparentMesh: 1
+--- !u!114 &7180240731222624130
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5313434659621491447}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: f3a23023775d5604cbae05a554da8bce, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7981298386664250482
 GameObject:
   m_ObjectHideFlags: 0
@@ -396,6 +610,8 @@ RectTransform:
   - {fileID: 8307886021508962735}
   - {fileID: 1996675245006136864}
   - {fileID: 7959246005771612609}
+  - {fileID: 8151219374067323264}
+  - {fileID: 8315499110496964167}
   - {fileID: 1146183520943964229}
   m_Father: {fileID: 0}
   m_RootOrder: -1
@@ -474,7 +690,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isSelect: 1
-  nowProgress: 0.35
+  targetProgress: 0
   idName: 12
   useColor: {r: 0.9612525, g: 0.9811321, b: 0, a: 1}
   index: 0
@@ -486,4 +702,15 @@ MonoBehaviour:
   SelectAniScale: 0.95
   SelectButtonDownScale: 0.85
   NotSelectButtonDownScale: 0.75
+  Jindu_NotWave: {fileID: 7180240731222624130}
+  JIndu_Wave: {fileID: 5122731428575164473}
+  Select_CirCle: {fileID: 3160742059448807472}
+  GroupData:
+    id: 0
+    roomIds: 
+    R: 0
+    G: 0
+    B: 0
+  ClickAreaCount: 0
+  AllAreaCount: 0
   CanPlayAniFlag: 0

Assets/scripts/perfabItems/RawImageWaterWave.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class RawImageWaterWave : MonoBehaviour
+{
+    //初始波浪高度(偏距)
+    public float heightPercent = 0.5f;
+    //波浪高度(值越接近于0,波浪越矮)(振幅)
+    [SerializeField] float waveHeightParame = 0.1f;
+    //波浪宽度(值越接近于0,波浪越宽)(角速度)
+    [SerializeField] float waveWidthParame = 7;
+    //波动速度(初相)
+    [SerializeField] float speed = 1;
+    //默认颜色
+    [SerializeField] Color32 defaultColor;
+
+    //RawImage组件
+    public RawImage waveImage;
+    //待显示图片
+    Texture2D showTexture;
+    //像素点
+    Color32[] pixelsBaseArr;
+    Color32[] pixelsDrawArr;
+
+    public bool PlayFlag;
+    void Start()
+    {
+        //备份贴图
+        showTexture = waveImage.mainTexture as Texture2D;
+        showTexture = Instantiate(showTexture);
+        waveImage.texture = showTexture;
+        //初始像素点
+        pixelsBaseArr = showTexture.GetPixels32();
+        //变化像素点
+        pixelsDrawArr = new Color32[pixelsBaseArr.Length];
+    }
+
+    void Update()
+    {
+        if(PlayFlag)
+            Wave();
+    }
+
+    public void Wave()
+    {
+        //拷贝初始像素点
+        System.Array.Copy(pixelsBaseArr, pixelsDrawArr, pixelsBaseArr.Length);
+        //遍历所有Texture像素点
+        for (int x = 0; x < showTexture.width; x++)
+        {
+            //偏移系数
+            float tmpOffectParame = waveHeightParame * Mathf.Sin(waveWidthParame * x / showTexture.width + Time.time * speed);
+            //限制极值
+            float tmpHeightParame = Mathf.Clamp(heightPercent + tmpOffectParame, 0, 1);
+            //计算高度
+            int tmpHeight = (int)(tmpHeightParame * showTexture.height);
+            //高度大于指定高度的像素点,显示默认色值
+            for (int y = tmpHeight; y < showTexture.height; y++)
+            {
+                //将showTexture的width与height转化为pixelsDrawArr像素点数组的下标
+                pixelsDrawArr[y * showTexture.width + x] = defaultColor;
+            }
+        }
+        //Texture赋值
+        showTexture.SetPixels32(pixelsDrawArr);
+        showTexture.Apply();
+    }
+
+}
\ No newline at end of file

Assets/Art/New Folder.meta → Assets/scripts/perfabItems/RawImageWaterWave.cs.meta

 fileFormatVersion: 2
-guid: 3f8aca84e2bb76c45a1446863094cd08
-folderAsset: yes
-DefaultImporter:
+guid: 6bfa03d1885f054459811941e40d6121
+MonoImporter:
   externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/scripts/perfabItems/colorItem.cs

@@ -32,6 +32,10 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
     public float SelectButtonDownScale;  //选中的按钮按下缩放大小
     public float NotSelectButtonDownScale; //没选中的按钮按下的缩放大小
 
+    public Image Jindu_NotWave;
+    public RawImageWaterWave JIndu_Wave;
+
+    public GameObject Select_CirCle;
 
     public RoomGroupsData GroupData;  //有关这个组的区域数据
     public float ClickAreaCount;  //涂了的区域
@@ -41,11 +45,9 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
         get { return gID; }
         set { gID = value; }
     }
-    private List<Vector2> initScaleSize = new List<Vector2>();
 
     private Vector3 LocalPos_Root;//记录实例化出来后在本地的原始坐标
 
-    private Material mat;
 
     public bool CanPlayAniFlag;
 
@@ -60,13 +62,17 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
 
     public bool IsSelect
     {
-        set {
+        set 
+        {
             isSelect = value;
-           
-            //transform.Find("finish").gameObject.SetActive(!value);
-            //transform.Find("minBar").gameObject.SetActive(value);
-            transform.Find("nowSelectFlg").gameObject.SetActive(isSelect);
-            
+            Select_CirCle.SetActive(isSelect);
+            JIndu_Wave.gameObject.SetActive(isSelect);
+            Jindu_NotWave.gameObject.SetActive(!isSelect);
+            if (NowProgress > 0)
+            {
+                JIndu_Wave.PlayFlag = isSelect;
+                JIndu_Wave.heightPercent = NowProgress;
+            }
         }
         get
         {
@@ -77,17 +83,11 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
     public void Init(Color color,float Jindu,int groupid)
     {
         IsSelect = false;
-        if (mat == null)
-        {
-            CreateMat();
-        }
-        nowvalue = Jindu;
+        targetProgress = Jindu;
         NowProgress = Jindu;
         UseColor = color;
         GID = groupid;
         IdName = groupid.ToString();
-
-        Image_Jindu.material.SetFloat("progress", Jindu);
     }
 
     public void ChangeProgress(float jindu)
@@ -119,8 +119,11 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
         set 
         {
             targetProgress = value;
-            //Image_Jindu.material.SetFloat("progress", targetProgress);
 
+            if (isSelect && value>0)
+            {
+                JIndu_Wave.PlayFlag = true;
+            }
         }
         get
         {
@@ -138,7 +141,8 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
             {
                 nowvalue = targetProgress;
             }
-            Image_Jindu.material.SetFloat("progress", nowvalue);
+            Jindu_NotWave.fillAmount = nowvalue;
+            JIndu_Wave.heightPercent = nowvalue;
         }
     }
 
@@ -185,8 +189,8 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
 
             Image_DI.color = color1;
 
-            Image_Jindu.material.SetColor("color1", UseColor);
-            Image_Jindu.material.SetColor("color2", new Color(color1.r, color1.g - 0.1f, color1.b - 0.1f, color1.a));
+            Jindu_NotWave.color = new Color(color1.r, color1.g - 0.1f, color1.b - 0.1f, color1.a);
+            JIndu_Wave.waveImage.color = Jindu_NotWave.color;
 
         }
         get
@@ -195,15 +199,6 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
         }
     }
 
-
-    public void CreateMat()
-    {
-        mat = Image_Jindu.material;
-        mat = Instantiate(mat);
-        Image_Jindu.material = mat;
-        transform.localScale = Vector3.one * NotSelectScale;
-    }
-
     public void onClickAreaGroup()
     {
         if (IsSelect)