更新代码

Assets/GameMgr/GameMgr.cs

@@ -39,7 +39,7 @@ public class GameMgr : MonoBehaviour
     public static int gunSize = 50;
     void Update()
     {
-        Scale();
+        //Scale();
         Click();
         Play();
     }

Assets/GameMgr/MainData.cs

@@ -105,7 +105,7 @@ public class MainData : MonoBehaviour
                     GameMgr.Ins.tiMgr.CircleId(id);
                     GameMgr.Ins.miMgr.Play(v, id);
                     EventDispatcher.Dispatch(EventName.Event.Event_GropuItemChange, json.roomGroupsData[i]);
-                    SaveManager.Instance.SaveRes(key, json, png);
+                    //SaveManager.Instance.SaveRes(key, json, png);
                     return true;
                 }
             }

Assets/Resources/cc2D9Z2w9k0evqUiCQ.meta

 fileFormatVersion: 2
-guid: e1a4b56527f3c6b469370492787c8cc0
+guid: b7a03d39f4dc7e3488e52979d411896c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Resources/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ.bin.meta

 fileFormatVersion: 2
-guid: 24a050efd55c9fd498ddfea866995bb4
+guid: 48ee325df8273914db99b26a9fc3c827
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Resources/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ.json.meta

 fileFormatVersion: 2
-guid: 491797f705885ce49aee1ec65e4232aa
+guid: d321d0c9473e0a549bf146ae98fc6de8
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Resources/cc2D9Z2w9k0evqUiCQ/jpg.jpg.meta

 fileFormatVersion: 2
-guid: 5fa4e00fb3dd65d4d8a6b03a484b3161
+guid: 7e477fdcb833ced4eadd3c3a867c249f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Resources/cc2D9Z2w9k0evqUiCQ/png.png.meta

 fileFormatVersion: 2
-guid: 3a6827d009dacda4fb410ff8123c9c2e
+guid: 06041cd5648518c499649c85181dccab
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Resources/cc2D9Z2w9k0evqUiCQ/pngSave.png.meta

 fileFormatVersion: 2
-guid: 4f1b4e40bf8a2b24cb7fbacd56a8edf9
+guid: cdbb48c71431697419610445e923d76b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Resources/perfabs/GameMgr.prefab

@@ -36,8 +36,8 @@ RectTransform:
   m_Father: {fileID: 136994829194703267}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -5844,6 +5844,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2908597137679265870}
   - component: {fileID: 5938029588001435437}
+  - component: {fileID: 977886392249047969}
   m_Layer: 5
   m_Name: GameMgr
   m_TagString: Untagged
@@ -5889,6 +5890,26 @@ MonoBehaviour:
   tiMgr: {fileID: 1490190831900560014}
   eiMgr: {fileID: 3661810172065829162}
   gray: {fileID: 2800000, guid: cfe63fc6a2e3edc409d653cefd205fb7, type: 3}
+--- !u!114 &977886392249047969
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6736099197143395873}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c81c988b987c51d419b0f2d938a46b14, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 2902754919140836122}
+  scaleSpeed: 1.2
+  canvasCamera: {fileID: 0}
+  scrollRect: {fileID: 1238786231969924280}
+  MinScale: 0.3
+  MaxScale: 6
+  Min_Move: 0.2
+  Max_Move: 7
 --- !u!1 &8927003478227325637
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/gameScene.unity

@@ -634,7 +634,6 @@ GameObject:
   - component: {fileID: 297775247}
   - component: {fileID: 297775246}
   - component: {fileID: 297775249}
-  - component: {fileID: 297775250}
   - component: {fileID: 297775251}
   m_Layer: 0
   m_Name: Main Camera
@@ -761,33 +760,6 @@ MonoBehaviour:
     mipBias: 0
     varianceClampScale: 0.9
     contrastAdaptiveSharpening: 0
---- !u!114 &297775250
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 297775245}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c81c988b987c51d419b0f2d938a46b14, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  target: {fileID: 7418061516327095409}
-  scaleSpeed: 1
-  canvasCamera: {fileID: 297775247}
-  ScrollRect: {fileID: 6786605224267383807}
-  MinScale: 0.3
-  MaxScale: 10
-  Min_Move: 0.2
-  Max_Move: 12
-  AreaPoint_Right_Up: {fileID: 2805568294008572717}
-  AreaPoint_Left_Down: {fileID: 4044314258423458531}
-  TipBtn: {fileID: 3394804452262531086}
-  AutoBtn: {fileID: 1354215336290540113}
-  CloseBtn: {fileID: 669974489}
-  Test_Text: {fileID: 1230079831}
-  ReSetPosBtn: {fileID: 3853497852481138177}
 --- !u!114 &297775251
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2350,6 +2322,86 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1555736098}
   m_CullTransparentMesh: 1
+--- !u!1 &1556700567
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1556700568}
+  - component: {fileID: 1556700570}
+  - component: {fileID: 1556700569}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1556700568
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1556700567}
+  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: 1147557151012020857}
+  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: -25, y: -752}
+  m_SizeDelta: {x: 310.26, y: 65.005}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1556700569
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1556700567}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5E27\u6570\uFF1A01"
+--- !u!222 &1556700570
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1556700567}
+  m_CullTransparentMesh: 1
 --- !u!1 &1591818771
 GameObject:
   m_ObjectHideFlags: 0
@@ -4625,6 +4677,7 @@ RectTransform:
   - {fileID: 6714159874655592954}
   - {fileID: 551004409273782827}
   - {fileID: 1943337312}
+  - {fileID: 1556700568}
   m_Father: {fileID: 414882564}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6731,6 +6784,7 @@ GameObject:
   - component: {fileID: 7606499463140480860}
   - component: {fileID: 1887083069486426954}
   - component: {fileID: 3214058083415617223}
+  - component: {fileID: 8074077716897695281}
   m_Layer: 5
   m_Name: gameShowView
   m_TagString: Untagged
@@ -8106,6 +8160,26 @@ MonoBehaviour:
   selectTextureIdx: 0
   MrgParent: {fileID: 7418061516327095409}
   LoadingPanel: {fileID: 7418061516327095409}
+--- !u!114 &8074077716897695281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4951044742539944732}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c81c988b987c51d419b0f2d938a46b14, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 7418061516327095409}
+  scaleSpeed: 1
+  canvasCamera: {fileID: 297775247}
+  scrollRect: {fileID: 0}
+  MinScale: 0.3
+  MaxScale: 10
+  Min_Move: 0.2
+  Max_Move: 12
 --- !u!114 &8094727572906316438
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8536,6 +8610,7 @@ MonoBehaviour:
   TipTitle: {fileID: 1539005795910344629}
   AllProcress: {fileID: 1667660345673518993}
   AllProcress_Text: {fileID: 4457589912443491345}
+  Text: {fileID: 1556700569}
 --- !u!114 &9174292048928438190
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Unity.VisualScripting.Generated/VisualScripting.Core/AotStubs.cs.meta → Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ.meta

 fileFormatVersion: 2
-guid: 240999ec40af1f642a0da2ccb30cbb9e
-MonoImporter:
+guid: e934f1d0be09d3c4fa21cb5b490d8772
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ.bin.meta

+fileFormatVersion: 2
+guid: 7ee95e13e87432841a975e939f670522
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Unity.VisualScripting.Generated/VisualScripting.Core/link.xml.meta → Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ.json.meta

 fileFormatVersion: 2
-guid: 7bcc66944a848e740ad8354eddbe4a1a
+guid: e927c749bfe817144b7d50905df2cbc0
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/jpg.jpg.meta

+fileFormatVersion: 2
+guid: cf66d882f1b15b64d9be178a311b9657
+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/StreamingAssets/cc2D9Z2w9k0evqUiCQ/png.png.meta

+fileFormatVersion: 2
+guid: c3d5506426d4db6429b34099c35001a2
+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/StreamingAssets/cc2D9Z2w9k0evqUiCQ/pngSave.png.meta

+fileFormatVersion: 2
+guid: c16ead685cea1e44aab55a0871b83153
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 4
+    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/Unity.VisualScripting.Generated/VisualScripting.Core/link.xml

-<linker>
-  <assembly fullname="Unity.VisualScripting.Core" preserve="all" />
-  <assembly fullname="Unity.VisualScripting.Flow" preserve="all" />
-  <assembly fullname="Unity.VisualScripting.State" preserve="all" />
-</linker>
\ No newline at end of file

Assets/scripts/Panel/LoadingPanel.cs

@@ -26,6 +26,7 @@ public class LoadingPanel : MonoBehaviour
 
     private void ClosePanel(object[] values)
     {
+        Debug.Log($"11111   رս");
         if (gameObject.activeSelf)
         {
             JIndu.value = 1;

Assets/scripts/Views/maingame/GroupListManager.cs

@@ -21,9 +21,14 @@ public class GroupListManager : MonoBehaviour
     public GameObject TipTitle; //提示文本
     public Slider AllProcress; //總的進度
     public TextMeshProUGUI AllProcress_Text; //百分比進度
+    private List<colorItem> AllItem = new List<colorItem>();
 
+    private float AllAreaCount;
+    private float ClickAreaCount;
 
-    private List<colorItem> AllItem = new List<colorItem>();
+    private int Frame;
+    private float time;
+    public Text Text;
     private void Awake()
     {
         instance = this;
@@ -45,25 +50,18 @@ public class GroupListManager : MonoBehaviour
         EventDispatcher.RegisterEvent(EventName.Event.Event_ChoiseGroupByPic, Event_ChoiseGroupByPic, flag);
     }
 
-    //private void Update()
-    //{
-    //    if (Input.GetKeyDown(KeyCode.A))  //后面还要用上的，先不删
-    //    {
-    //        var item = AllItem[AllItem.Count - 1];
-    //        if (item != null)
-    //        {
-    //            RemoveAGroup(item);
-    //        }
-    //    }
-    //    if (Input.GetKeyDown(KeyCode.S))
-    //    {
-    //        var item = AllItem[AllItem.Count - 2];
-    //        if (item != null)
-    //        {
-    //            RemoveAGroup(item);
-    //        }
-    //    }
-    //}
+    private void Update()
+    {
+        Frame++;
+
+        time += Time.deltaTime;
+        if (time >= 1)
+        {
+            Text.text = $"帧数：{Frame}";
+            time = 0;
+            Frame = 0;
+        }
+    }
     private void Event_ChoiseGroupByPic(object[] values) //图片区域长按选择一个组
     {
         int Gid = (int)values[0];
@@ -105,14 +103,35 @@ public class GroupListManager : MonoBehaviour
         var item = AllItem.FirstOrDefault((a) => { return a.GID == data.id; });
         if (item != null)
         {
+            float value = data.roomIdsOver.Count - item.ClickAreaCount;
+            item.ClickAreaCount = data.roomIdsOver.Count;
+            ClickAreaCount = ClickAreaCount + value;
+
             item.ChangeProgress(Jindu);
             if (Jindu >= 1)
             {
                 RemoveAGroup(item);
             }
         }
+
+        for (int i = 0; i < AllItem.Count; i++)
+        {
+            var ite = AllItem[i];
+            if (ite.GID == data.id)
+            {
+                ite.GroupData = data;
+            }
         }
+        SetTotalProcress();
+    }
+
 
+    private void SetTotalProcress()
+    {
+        float value = ClickAreaCount / AllAreaCount;
+        AllProcress.value = value;
+        AllProcress_Text.text = value.ToString("P0");
+    }
     private void RemoveAGroup(colorItem removeitem)
     {
         AllItem.Remove(removeitem);
@@ -141,6 +160,7 @@ public class GroupListManager : MonoBehaviour
                 {
                     ite.IsSelect = true;
                     ite.switchPlayAnimation();
+                    GameMgr.Ins.ChooseGroup(ite.GID);
                 }
             }
 
@@ -157,14 +177,21 @@ public class GroupListManager : MonoBehaviour
                 {
                     ite.IsSelect = true;
                     ite.switchPlayAnimation();
+                    GameMgr.Ins.ChooseGroup(ite.GID);
                 }
                 ite.index--;
             }
         }
+
+
     }
 
     private void CreateGroup(object[] values)
     {
+        Debug.Log($"11111  创建组");
+        AllAreaCount = 0;
+        ClickAreaCount = 0;
+
         List<RoomGroupsData> roomGroupsData = (List<RoomGroupsData>)values[0];
         int AllGroupNum = roomGroupsData.Count;  //总的组个数
         float NowJindu = 0f;  //现在的进度
@@ -181,9 +208,14 @@ public class GroupListManager : MonoBehaviour
         {
             foreach (var item in roomGroupsData)
             {
-                tran = Content.transform.GetChild(index);
                 NowJindu = (float)item.roomIdsOver.Count / (item.roomIds.Count + item.roomIdsOver.Count);
-                var coloritem = InitItem(tran, new Color(item.R, item.G, item.B) / 255f, NowJindu, item.id);
+
+                AllAreaCount = AllAreaCount + item.roomIds.Count + item.roomIdsOver.Count;
+                ClickAreaCount = ClickAreaCount + item.roomIdsOver.Count;
+                if (NowJindu >= 1)
+                    continue;
+                tran = Content.transform.GetChild(index);
+                var coloritem = InitItem(tran, item, NowJindu, item.id);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
@@ -193,10 +225,14 @@ public class GroupListManager : MonoBehaviour
         {
             for (int i = 0; i < childCount; i++)
             {
-                tran = Content.transform.GetChild(index);
                 var item = roomGroupsData[index];
                 NowJindu = (float)item.roomIdsOver.Count / (item.roomIds.Count + item.roomIdsOver.Count);
-                var coloritem = InitItem(tran, new Color(item.R, item.G, item.B) / 255f, NowJindu, item.id);
+                AllAreaCount = AllAreaCount + item.roomIds.Count + item.roomIdsOver.Count;
+                ClickAreaCount = ClickAreaCount + item.roomIdsOver.Count;
+                if (NowJindu >= 1)
+                    continue;
+                tran = Content.transform.GetChild(index);
+                var coloritem = InitItem(tran, item, NowJindu, item.id);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
@@ -206,9 +242,14 @@ public class GroupListManager : MonoBehaviour
             for (int i = 0; i < AllGroupNum; i++)
             {
                 var item = roomGroupsData[index];
-                tran = GameObject.Instantiate(GroupItem_Obj).transform;
                 NowJindu = (float)item.roomIdsOver.Count / (item.roomIds.Count + item.roomIdsOver.Count);
-                var coloritem = InitItem(tran, new Color(item.R, item.G, item.B) / 255f, NowJindu, item.id);
+                AllAreaCount = AllAreaCount + item.roomIds.Count + item.roomIdsOver.Count;
+                ClickAreaCount = ClickAreaCount + item.roomIdsOver.Count;
+                if (NowJindu >= 1)
+                    continue;
+
+                tran = GameObject.Instantiate(GroupItem_Obj).transform;
+                var coloritem = InitItem(tran, item, NowJindu, item.id);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
@@ -217,6 +258,7 @@ public class GroupListManager : MonoBehaviour
 
         EventDispatcher.Dispatch(EventName.Event.Event_LoadingPanelCLose);
         StartCoroutine(Delay());
+        SetTotalProcress();
     }
 
     IEnumerator Delay()
@@ -229,7 +271,7 @@ public class GroupListManager : MonoBehaviour
             item.PlayInitAni();
         }
     }
-    private colorItem InitItem(Transform tran,Color color,float Jindu,int gid)
+    private colorItem InitItem(Transform tran, RoomGroupsData GroupData , float Jindu,int gid)
     {
         tran.SetParent(Content.transform);
         tran.localPosition = Vector3.zero;
@@ -238,7 +280,10 @@ public class GroupListManager : MonoBehaviour
         tran.gameObject.SetActive(true);
 
         var coloritem = tran.GetComponent<colorItem>();
-        coloritem.Init(color, Jindu, gid);
+        coloritem.Init(new Color(GroupData.R, GroupData.G, GroupData.B) / 255f, Jindu, gid);
+        coloritem.GroupData = GroupData;
+        coloritem.ClickAreaCount = GroupData.roomIdsOver.Count;
+        coloritem.AllAreaCount = GroupData.roomIds.Count + GroupData.roomIdsOver.Count;
         return coloritem;
     }
 

Assets/scripts/Views/maingame/Native.cs

@@ -84,7 +84,7 @@ public class Native : MonoBehaviour
         Debug.Log("JSON:" + json);
 
         json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/cc--EDgRpc_nHQru7H.png\",\"hybridType\":64,\"id\":\"cc--EDgRpc_nHQru7H\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/cc--EDgRpc_nHQru7H.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}";
-        string name = "cc3W3C7u7UGXjwYQdn";
+        string name = "cc2D9Z2w9k0evqUiCQ";
         json = json.Replace("cc--EDgRpc_nHQru7H", name);
         //json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/ccnKNH1bTLS-_Mg7A2.png\",\"hybridType\":64,\"id\":\"ccnKNH1bTLS-_Mg7A2\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/ccnKNH1bTLS-_Mg7A2.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}";
         //#endif

Assets/scripts/perfabItems/colorItem.cs

@@ -31,6 +31,11 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
     public float SelectAniScale;  //选中的动画最大缩放
     public float SelectButtonDownScale;  //选中的按钮按下缩放大小
     public float NotSelectButtonDownScale; //没选中的按钮按下的缩放大小
+
+
+    public RoomGroupsData GroupData;  //有关这个组的区域数据
+    public float ClickAreaCount;  //涂了的区域
+    public float AllAreaCount; //总的区域
     public int GID  //组ID
     {
         get { return gID; }

ProjectSettings/GraphicsSettings.asset

@@ -34,6 +34,7 @@ GraphicsSettings:
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: -6465566751694194690, guid: 863ea3bf5345f1049ae1a7c0ed2f242b, type: 3}
   m_PreloadedShaders: []
   m_PreloadShadersBatchTimeLimit: -1
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}