备份铁匠资源

Blacksmith/Assets/Pack/UI/73afa3a036cbd7a57cba1c3fca347f0.jpg.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: f8ce3fb1c628dc549a32a253b410c3ca
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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: 0
+  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: 100
+  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: -1
+    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: iPhone
+    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: WebGL
+    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: 

Blacksmith/Assets/Pack/UI/ForgePanel/ef62254e9992a41acdf4cc9a4bf0355.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 8607e967311a7c14caaca1635cccc45e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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: 0
+  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: 100
+  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: -1
+    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: iPhone
+    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: WebGL
+    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: 

Blacksmith/Assets/Scenes/SampleScene.unity

@@ -688,7 +688,7 @@ Transform:
   m_GameObject: {fileID: 1708146006}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -24.5, y: 6.2, z: 0}
+  m_LocalPosition: {x: -21.4, y: 6.2, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -750,7 +750,7 @@ Transform:
   m_GameObject: {fileID: 2021164978}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 21.9, y: 6.200001, z: 0}
+  m_LocalPosition: {x: 19.1, y: 6.200001, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -889,6 +889,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.00000004371139
+      objectReference: {fileID: 0}
+    - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 2534.0264
@@ -897,6 +909,38 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -0.0000616307
       objectReference: {fileID: 0}
+    - target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.019481
+      objectReference: {fileID: 0}
+    - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.000000014108153
+      objectReference: {fileID: 0}
     - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 360
@@ -913,6 +957,18 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0.0000118310445
       objectReference: {fileID: 0}
+    - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.019481
+      objectReference: {fileID: 0}
+    - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.000000008659961
+      objectReference: {fileID: 0}
     - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 360
@@ -921,6 +977,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -0.0000032498758
       objectReference: {fileID: 0}
+    - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6213826
+      objectReference: {fileID: 0}
+    - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.000000057662152
+      objectReference: {fileID: 0}
     - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 359.99997
@@ -929,6 +1001,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0.0000067430556
       objectReference: {fileID: 0}
+    - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.0000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.000000007728171
+      objectReference: {fileID: 0}
     - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 359.99997
@@ -981,6 +1069,22 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3491874388263843074, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 360.00003
@@ -989,6 +1093,18 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0.0000118310445
       objectReference: {fileID: 0}
+    - target: {fileID: 3504301148192295494, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3504301148192295494, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3535150357896660372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.000020235777
+      objectReference: {fileID: 0}
     - target: {fileID: 3924915755643395529, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 360
@@ -1025,6 +1141,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -358.35217
       objectReference: {fileID: 0}
+    - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.62138253
+      objectReference: {fileID: 0}
+    - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.00000005063816
+      objectReference: {fileID: 0}
     - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 360
@@ -1033,6 +1165,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -1.4701469e-12
       objectReference: {fileID: 0}
+    - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.5937905
+      objectReference: {fileID: 0}
+    - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.000000040369912
+      objectReference: {fileID: 0}
     - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 360
@@ -1053,6 +1201,26 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5101466207984114834, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5101466207984114834, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.00000004371139
+      objectReference: {fileID: 0}
+    - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 2534.0264
@@ -1061,6 +1229,30 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -0.000037788843
       objectReference: {fileID: 0}
+    - target: {fileID: 5828942971782581090, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5828942971782581090, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.5937901
+      objectReference: {fileID: 0}
+    - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.00000003891512
+      objectReference: {fileID: 0}
     - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 360.00006
@@ -1069,6 +1261,30 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -0.0000046014075
       objectReference: {fileID: 0}
+    - target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0.00004157424
+      objectReference: {fileID: 0}
+    - target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.0002417051
+      objectReference: {fileID: 0}
+    - target: {fileID: 7353981888873689265, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.000020235777
+      objectReference: {fileID: 0}
+    - target: {fileID: 7798967289364784859, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7798967289364784859, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7828562722598263467, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 360.00003
@@ -1085,6 +1301,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -0.0000616307
       objectReference: {fileID: 0}
+    - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.0000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.000000009365342
+      objectReference: {fileID: 0}
     - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 359.99997
@@ -1105,6 +1337,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: Canvas
       objectReference: {fileID: 0}
+    - target: {fileID: 8845859242310593705, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0.000034615397
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845859242310593705, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.0003009931
+      objectReference: {fileID: 0}
     - target: {fileID: 8849191488238675942, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 2534.0264

Blacksmith/Assets/Script/GameSystem.cs

@@ -223,6 +223,12 @@ public class GameSystem : MonoBehaviour
         forgePanel.OpenStartPanel();
     }
 
+    public void CloseStore()
+    {
+        _npcBuyDatas.Clear();
+        forgePanel.OpenStartPanel();
+        nowTime = maxTime;
+    }
     /// <summary>
     /// 设置购买物品和无物品判断
     /// </summary>

Blacksmith/Assets/Script/UI/BattlePanel.cs

@@ -32,6 +32,7 @@ public class BattlePanel : MonoBehaviour
     [SerializeField] private Button openWeaponry;
     [SerializeField] private Button openSoldier;
     [SerializeField] private Button startButton;
+    [SerializeField] private Button closeBaterWaitButton;
     [SerializeField] private int levelID = 0;
     
     [SerializeField] private Text _goldNum;
@@ -57,7 +58,7 @@ public class BattlePanel : MonoBehaviour
         openItemParent.onClick.AddListener(OpenItemPanel);
         closeItemParent.onClick.AddListener(CloseItemPanel);
         startButton.onClick.AddListener(StartBattle);
-        readyPanel.SetActive(false);
+        closeBaterWaitButton.onClick.AddListener(CloseWaitPanel);
     }
 
     // Update is called once per frame
@@ -74,6 +75,7 @@ public class BattlePanel : MonoBehaviour
         openItemParent.onClick.RemoveListener(OpenItemPanel);
         closeItemParent.onClick.RemoveListener(CloseItemPanel);
         startButton.onClick.RemoveListener(StartBattle);
+        closeBaterWaitButton.onClick.RemoveListener(CloseWaitPanel);
     }
     #endregion
 
@@ -99,6 +101,7 @@ public class BattlePanel : MonoBehaviour
         }
         DataManager.SetNowLevel(levelID);
         OpenLevel();
+        readyPanel.SetActive(false);
     }
     public void OpenLevel()
     {
@@ -112,8 +115,7 @@ public class BattlePanel : MonoBehaviour
     }
     private void OpenCombatPanel()
     {
-        if (DataManager.GetPhysical()>=5)
+        
-        {
             DataManager.RemovePhysical();
             readyPanel.SetActive(true);
             UIMgr.ins.CloseSwithPanel();
@@ -130,9 +132,12 @@ public class BattlePanel : MonoBehaviour
             BattleManager.ins.GetAttribute(ref h, ref a);
             _hpText.text = h.ToString();
             _attackText.text = a.ToString();
-        }
     }
 
+    public void CloseWaitPanel()
+    {
+        UIMgr.ins.OpenBattlePanel();
+    }
     public void SetPlayerIndex()
     {
         foreach (var pBar in _playerBars)
@@ -210,8 +215,9 @@ public class BattlePanel : MonoBehaviour
 
     private void StartBattle()
     {
-        if (BattleManager.ins.BattleStart())
+        if (BattleManager.ins.BattleStart()&& DataManager.GetPhysical()>=5)
         {
+            DataManager.RemovePhysical();
             BattleManager.ins.StartBattle();
         }
     }

Blacksmith/Assets/Script/UI/ForgePanel.cs

@@ -29,6 +29,7 @@ public class ForgePanel : MonoBehaviour
     [SerializeField] private Button title;
     [SerializeField] public Button _buyEventButton;
     [SerializeField] private Button _getGoldButton;
+    [SerializeField] private Button closeStoreButton;
     [SerializeField] private Text textPro;
     [SerializeField] private CraftingPanel _craftingPanel;
     [SerializeField] private SettlementPanel _settlementPanel;
@@ -57,6 +58,7 @@ public class ForgePanel : MonoBehaviour
         _craftButton.onClick.AddListener(CraftEvent);
         startButton.onClick.AddListener(GameStart);
         title.onClick.AddListener(CloseTitle);
+        closeStoreButton.onClick.AddListener(CloseStore);
     }
 
     // Update is called once per frame
@@ -108,6 +110,7 @@ public class ForgePanel : MonoBehaviour
         _craftButton.onClick.RemoveListener(CraftEvent);
         startButton.onClick.RemoveListener(GameStart);
         title.onClick.RemoveListener(CloseTitle);
+        closeStoreButton.onClick.RemoveListener(CloseStore);
     }
 
     void GameStart()
@@ -116,6 +119,11 @@ public class ForgePanel : MonoBehaviour
         startAni.AnimationState.Complete += StartEvent;
     }
 
+    void CloseStore()
+    {
+        GameSystem.ins.CloseStore();
+    }
+
     private void StartEvent(TrackEntry trackentry)
     {
         startAni.AnimationState.Complete -= StartEvent;

Blacksmith/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset

@@ -9,17 +9,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 1795359250, guid: 1cf430f187a0b40eda7f668318d8be23, type: 3}
   m_Name: MiniGameConfig
-  m_EditorClassIdentifier: wx-editor:WeChatWASM:WXEditorScriptObject
+  m_EditorClassIdentifier: 
   ProjectConf:
     projectName: 
     Appid: 
-    CDN: 
+    CDN: https://www.youtukeji.com.cn/Game/Blacksmithv2/
     assetLoadType: 0
     compressDataPackage: 0
     VideoUrl: 
-    DST: E:\UnityProject\Game\Blacksmith\
+    DST: E:\Project\apk\Blacksmith
     StreamCDN: 
     bundleHashLength: 32
     bundlePathIdentifier: StreamingAssets;
@@ -29,7 +29,7 @@ MonoBehaviour:
     HideAfterCallMain: 1
     preloadFiles: 
     Orientation: 0
-    bgImageSrc: Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images/background.jpg
+    bgImageSrc: Assets/Pack/UI/73afa3a036cbd7a57cba1c3fca347f0.jpg
     dataFileSubPrefix: 
     maxStorage: 200
     defaultReleaseSize: 31457280

Blacksmith/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset.meta

@@ -2,11 +2,7 @@ fileFormatVersion: 2
 guid: 8deef7d4eaf645f48a68c68a2b347a57
 NativeFormatImporter:
   externalObjects: {}
-<<<<<<< Updated upstream
   mainObjectFileID: 11400000
-=======
-  mainObjectFileID: 0
->>>>>>> Stashed changes
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Blacksmith/UserSettings/Layouts/default-2022.dwlt

@@ -38,22 +38,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 1913
+    x: 1920
-<<<<<<< Updated upstream
+    y: 0
-    y: 48
     width: 1920
-    height: 984
+    height: 1032
-=======
-    y: 54
-    width: 1920
-    height: 978
->>>>>>> Stashed changes
   m_ShowMode: 0
   m_Title: Game
   m_RootView: {fileID: 7}
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
+  m_Maximized: 1
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -73,11 +67,7 @@ MonoBehaviour:
     width: 1920
     height: 989
   m_ShowMode: 4
-<<<<<<< Updated upstream
   m_Title: Console
-=======
-  m_Title: Project
->>>>>>> Stashed changes
   m_RootView: {fileID: 12}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -132,11 +122,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 50}
   m_MaxSize: {x: 8096, y: 8096}
   vertical: 0
-<<<<<<< Updated upstream
   controlID: 38
-=======
-  controlID: 39
->>>>>>> Stashed changes
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -156,15 +142,9 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1920
-<<<<<<< Updated upstream
+    height: 1032
-    height: 984
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-=======
-    height: 978
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
->>>>>>> Stashed changes
   m_ActualView: {fileID: 26}
   m_Panes:
   - {fileID: 26}
@@ -189,11 +169,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1920
-<<<<<<< Updated upstream
+    height: 1032
-    height: 984
-=======
-    height: 978
->>>>>>> Stashed changes
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
@@ -223,11 +199,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-<<<<<<< Updated upstream
+  controlID: 136
-  controlID: 118
-=======
-  controlID: 116
->>>>>>> Stashed changes
   draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -248,8 +220,8 @@ MonoBehaviour:
     y: 0
     width: 347
     height: 939
-  m_MinSize: {x: 275, y: 50}
+  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 22}
   m_Panes:
   - {fileID: 22}
@@ -272,15 +244,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 388
+    width: 385
-    height: 559
+    height: 525
-<<<<<<< Updated upstream
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-=======
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
->>>>>>> Stashed changes
   m_ActualView: {fileID: 23}
   m_Panes:
   - {fileID: 23}
@@ -296,29 +263,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 559
+    y: 525
     width: 1573
-    height: 380
+    height: 414
-<<<<<<< Updated upstream
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 25}
-=======
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 21}
->>>>>>> Stashed changes
   m_Panes:
   - {fileID: 21}
   - {fileID: 25}
-  m_Selected: 0
+  m_Selected: 1
-  m_LastSelected: 1
+  m_LastSelected: 0
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -414,11 +375,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-<<<<<<< Updated upstream
   controlID: 71
-=======
-  controlID: 125
->>>>>>> Stashed changes
   draggingID: 0
 --- !u!114 &16
 MonoBehaviour:
@@ -440,15 +397,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1573
-    height: 559
+    height: 525
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-<<<<<<< Updated upstream
   controlID: 72
-=======
-  controlID: 70
->>>>>>> Stashed changes
   draggingID: 0
 --- !u!114 &17
 MonoBehaviour:
@@ -465,17 +418,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 388
+    x: 385
     y: 0
-    width: 1185
+    width: 1188
-    height: 559
+    height: 525
-<<<<<<< Updated upstream
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-=======
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
->>>>>>> Stashed changes
   m_ActualView: {fileID: 24}
   m_Panes:
   - {fileID: 24}
@@ -632,9 +580,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 632
+    y: 598
     width: 1572
-    height: 359
+    height: 393
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -656,39 +604,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-<<<<<<< Updated upstream
+    - Assets/Pack/UI
-    - Assets/Script/UI
-=======
-    - Assets
->>>>>>> Stashed changes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
-  m_StartGridSize: 16
+  m_StartGridSize: 87
   m_LastFolders:
-<<<<<<< Updated upstream
+  - Assets/Pack/UI
-  - Assets/Script/UI
+  m_LastFoldersGridSize: 87
-=======
+  m_LastProjectPath: E:\Project\WXGame\Blacksmith
-  - Assets
->>>>>>> Stashed changes
-  m_LastFoldersGridSize: 16
-  m_LastProjectPath: E:\UnityProject\Game\Blacksmith
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-<<<<<<< Updated upstream
+    scrollPos: {x: 0, y: 120}
-    scrollPos: {x: 0, y: 349}
+    m_SelectedIDs: 3ca70000
-    m_SelectedIDs: 308d0000
+    m_LastClickedID: 42812
-    m_LastClickedID: 36144
+    m_ExpandedIDs: 00000000788d0000968d0000988d00009e8d00002aa7000036a700003ca70000fc220100fe22010000ca9a3bffffff7f
-    m_ExpandedIDs: 000000007a8b00007c8b0000c88c0000e48c0000ea8c0000308d0000328d0000dc50030000ca9a3bffffff7f
-=======
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 3c410000
-    m_LastClickedID: 16700
-    m_ExpandedIDs: 000000003c410000e8410000d843000000ca9a3bffffff7f
->>>>>>> Stashed changes
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -716,11 +649,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-<<<<<<< Updated upstream
+    m_ExpandedIDs: 00000000788d0000
-    m_ExpandedIDs: 000000007a8b00007c8b00007e8b0000
-=======
-    m_ExpandedIDs: 
->>>>>>> Stashed changes
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -745,30 +674,24 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-<<<<<<< Updated upstream
-    m_SelectedInstanceIDs: c0cf0500
-    m_LastClickedInstanceID: 380864
-    m_HadKeyboardFocusLastEvent: 1
-=======
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
->>>>>>> Stashed changes
     m_ExpandedInstanceIDs: c623000044860000228500003c0001002e000100be740000c4740000c2740000b4740000b2740000ba740000bc740000b0740000c0740000b6740000b87400009c7400008c740000867400009274000098740000967400009a74000090740000a07400008e740000847400009e740000000000004683000040830000388300005c830000aa780000d0690000e4690000f06a0000c06b00003a6a000070360500107a0000e27900009e6a0000267a0000387a00001e7a000082500200f0790000287a00007c7d00007aa100002a130100381301001a8300000c83000068f90200e88a0000728a00006a8d0000768a0000208a00006e8a0000008e0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: player
+      m_Name: 
-      m_OriginalName: player
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 339790
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 11}
     m_CreateAssetUtility:
@@ -778,12 +701,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-<<<<<<< Updated upstream
-    m_ScrollPosition: {x: 0, y: 40}
-=======
     m_ScrollPosition: {x: 0, y: 0}
->>>>>>> Stashed changes
+    m_GridSize: 87
-    m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 379
 --- !u!114 &22
@@ -827,7 +746,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 510
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:
@@ -855,8 +774,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 387
+    width: 384
-    height: 538
+    height: 504
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -870,15 +789,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-<<<<<<< Updated upstream
-      m_SelectedIDs: c0cf0500
-      m_LastClickedID: 380864
-      m_ExpandedIDs: 4047fdff4c47fdff5847fdff6447fdff6e47fdff004dfdff3268fdffa869fdff906afdff1870fdff4273fdff6083fdffacccfdffb2ccfdffb4ccfdffb6ccfdffbaccfdffbeccfdffc2ccfdff3038ffff3438ffff3a38ffff3e38ffff4038ffff4238ffff4438ffff7846fffffa4dffff7ee6ffffa2e6ffff64f1ffff2af3ffff2cf3ffff30f3ffff16fbffff0672000082720000e27200007a750000fc7500000a7600002476000038760000b6760000e27600002a770000b8770000d677000042790000b87900006a7a0000be7b0000e07b00009c7c0000c87c0000b47d0000b8810000088200005282000094820000f2820000fc820000f48400006e86000088870000ac870000048800005e8800007e5405006c570500505a05007ac10500fec4050036c5050048c60500c0cf0500
-=======
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: ce78fcff2479fcffac7cfcffe88efcfff4abfcfff8bafcff4ebbfcffd2befcffa8acfdffe8adfdff229801000e9c01003a9d0100ac9d0100069e0100249e01006ea2010088a201002ca50100daae0100
+      m_ExpandedIDs: 3ce3f5ffb0e3f5ff88fff5ff0240feff1643feffd843feffe243feff544afeff9863feff0a5effff1e5effff166bffff6c6bffff2287ffffe491ffff3a92fffff0adffff70d3ffffe4d4ffff44f9ffff16fbffff6e7600008077000034820000fc83000056840000c2890000348a0000da5c01000e4603007846030082460300
->>>>>>> Stashed changes
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -922,10 +835,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 388
+    x: 385
     y: 73
-    width: 1183
+    width: 1186
-    height: 538
+    height: 504
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -992,7 +905,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -1297,15 +1210,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-<<<<<<< Updated upstream
+    m_Target: {x: 901.33044, y: 1339.2908, z: -0.36185062}
-    m_Target: {x: 592.7956, y: 884.87994, z: -1.187256}
     speed: 2
-    m_Value: {x: 592.7956, y: 884.87994, z: -1.187256}
+    m_Value: {x: 901.33044, y: 1339.2908, z: -0.36185062}
-=======
-    m_Target: {x: 733.4134, y: 614.5811, z: 2.794509}
-    speed: 2
-    m_Value: {x: 733.4134, y: 614.5811, z: 2.794509}
->>>>>>> Stashed changes
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1355,15 +1262,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-<<<<<<< Updated upstream
+    m_Target: 346.1093
-    m_Target: 176.87944
     speed: 2
-    m_Value: 176.87944
+    m_Value: 346.1093
-=======
-    m_Target: 1079.4711
-    speed: 2
-    m_Value: 1079.4711
->>>>>>> Stashed changes
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1409,9 +1310,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 632
+    y: 598
     width: 1572
-    height: 359
+    height: 393
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1442,16 +1343,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1913
+    x: 1920
-<<<<<<< Updated upstream
+    y: 0
-    y: 48
     width: 1920
-    height: 963
+    height: 1011
-=======
-    y: 54
-    width: 1920
-    height: 957
->>>>>>> Stashed changes
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1507,38 +1402,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 1920
-<<<<<<< Updated upstream
+      height: 990
-      height: 942
+    m_Scale: {x: 0.515625, y: 0.515625}
-    m_Scale: {x: 0.490625, y: 0.490625}
+    m_Translation: {x: 960, y: 495}
-    m_Translation: {x: 960, y: 471}
-=======
-      height: 936
-    m_Scale: {x: 0.4875, y: 0.4875}
-    m_Translation: {x: 960, y: 468}
->>>>>>> Stashed changes
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-<<<<<<< Updated upstream
+      x: -1861.8182
-      x: -1956.6879
       y: -960
-      width: 3913.3757
+      width: 3723.6365
       height: 1920
     m_MinimalGUI: 1
-  m_defaultScale: 0.490625
+  m_defaultScale: 0.515625
-  m_LastWindowPixelSize: {x: 1920, y: 963}
+  m_LastWindowPixelSize: {x: 1920, y: 1011}
-=======
-      x: -1969.2307
-      y: -960
-      width: 3938.4614
-      height: 1920
-    m_MinimalGUI: 1
-  m_defaultScale: 0.4875
-  m_LastWindowPixelSize: {x: 1920, y: 957}
->>>>>>> Stashed changes
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000

box1/UserSettings/Layouts/default-2022.dwlt

@@ -43,7 +43,7 @@ MonoBehaviour:
     width: 1904
     height: 973
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Project
   m_RootView: {fileID: 9}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -67,8 +67,8 @@ MonoBehaviour:
     y: 0
     width: 1920
     height: 1032
-  m_MinSize: {x: 100, y: 100}
+  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -123,7 +123,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 128
+  controlID: 143
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -144,8 +144,8 @@ MonoBehaviour:
     y: 0
     width: 368
     height: 923
-  m_MinSize: {x: 275, y: 50}
+  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -170,8 +170,8 @@ MonoBehaviour:
     y: 0
     width: 361
     height: 484
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -299,7 +299,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 81
+  controlID: 86
   draggingID: 0
 --- !u!114 &13
 MonoBehaviour:
@@ -325,7 +325,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 82
+  controlID: 75
   draggingID: 0
 --- !u!114 &14
 MonoBehaviour:
@@ -346,8 +346,8 @@ MonoBehaviour:
     y: 0
     width: 1175
     height: 484
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -548,7 +548,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: datam
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -558,24 +558,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Script/UI
+    - Assets/Art/UI/MainPanel
     m_Globs: []
-    m_OriginalText: datam
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
-  m_StartGridSize: 96
+  m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Script/UI
+  - Assets/Art/UI/MainPanel
-  m_LastFoldersGridSize: 96
+  m_LastFoldersGridSize: 16
-  m_LastProjectPath: E:\UnityProject\Game\box1
+  m_LastProjectPath: E:\Project\WXGame\box1
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 56}
-    m_SelectedIDs: 3c820000
+    m_SelectedIDs: 7e820000
-    m_LastClickedID: 33340
+    m_LastClickedID: 33406
-    m_ExpandedIDs: 00000000f47f00000282000000ca9a3bffffff7f
+    m_ExpandedIDs: 00000000e67f0000e68100003482000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -603,7 +603,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000f47f0000
+    m_ExpandedIDs: 00000000e67f0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -631,7 +631,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000448600003c0001002e000100be740000c4740000c2740000b4740000b2740000ba740000bc740000b0740000c0740000b6740000b87400009c7400008c740000867400009274000098740000967400009a74000090740000a07400008e740000847400009e740000ce7700002ea800005ea80000006700001a7b0000187b0000107a0000c27900001ceb0000ea7a0000e07a0000d4c70000967e0000767f0000d67f0000c07d0000b4630000547d0000e87d00003a7d000000000000a4b5000024b700008e7d0000
+    m_ExpandedInstanceIDs: c6230000448600003c0001002e000100be740000c4740000c2740000b4740000b2740000ba740000bc740000b0740000c0740000b6740000b87400009c7400008c740000867400009274000098740000967400009a74000090740000a07400008e740000847400009e740000ce7700002ea800005ea80000006700001a7b0000187b0000107a0000c27900001ceb0000ea7a0000e07a0000d4c70000967e0000767f0000d67f0000c07d0000b4630000547d0000e87d00003a7d000000000000a4b5000024b700008e7d00001c720000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -656,7 +656,7 @@ MonoBehaviour:
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
     m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 96
+    m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 207
 --- !u!114 &18
@@ -743,9 +743,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 0afbffff
+      m_SelectedIDs: 
-      m_LastClickedID: -1270
+      m_LastClickedID: 0
-      m_ExpandedIDs: ccd7ffff16fbffff
+      m_ExpandedIDs: 34f9ffff44f9ffffe6f9ffff66faffffe8faffff16fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1164,9 +1164,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 713.1, y: 527.4595, z: 0}
+    m_Target: {x: 675.3631, y: 843.28033, z: -0.28472173}
     speed: 2
-    m_Value: {x: 713.1, y: 527.4595, z: 0}
+    m_Value: {x: 675.3631, y: 843.28033, z: -0.28472173}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1216,9 +1216,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 325
+    m_Target: 353.47217
     speed: 2
-    m_Value: 325
+    m_Value: 353.47217
   m_Ortho:
     m_Target: 1
     speed: 2