UI Res 修复

2 years ago · d734d13aba
parent 939e50472c
commit d734d13aba
13 changed files with 9627 additions and 9385 deletions
--- a/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset
+++ b/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset
@ -21,6 +21,6 @@ MonoBehaviour:
  mLastUsedPackagesHash: 1177269412
  mLastUsedPackagesCount: 1
  mLastBuildCode: 1
-  mLastEditorStartupTimeTicks: 638206149632250657
+  mLastEditorStartupTimeTicks: 638207960909662303
  mNewVersionAvailable: 1
  mLastAttachedFlowPlayerValue: 0
--- a/client/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset
+++ b/client/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset
@ -84,6 +84,19 @@ MonoBehaviour:
    childCount: 0
    indexOfFirstChild: 1
 --- !u!114 &-3719142779396439970
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1655710724, guid: 23cdf4a0ba64c164d8ffb0c744ae259d, type: 3}
+  m_Name: HierarchyManager
+  m_EditorClassIdentifier: 
+  serializedNodes: []
+--- !u!114 &-3249685302086668908
 MonoBehaviour:
  m_ObjectHideFlags: 3
  m_CorrespondingSourceObject: {fileID: 0}
@ -172,7 +185,7 @@ MonoBehaviour:
  m_Script: {fileID: -1676762633, guid: 23cdf4a0ba64c164d8ffb0c744ae259d, type: 3}
  m_Name: ArticyDatabase
  m_EditorClassIdentifier: 
-  mHierarchy: {fileID: -2128713445060946231}
+  mHierarchy: {fileID: -3249685302086668908}
  mLocalization: {fileID: -4256971298007036964}
  mInternalProject:
    mName: touhou
--- a/client/Assets/ArticyImporter/Content/Generated/Resources/gamedata.asset
+++ b/client/Assets/ArticyImporter/Content/Generated/Resources/gamedata.asset
--- a/client/Assets/Game/Arts/Material/PostProcessing.mat
+++ b/client/Assets/Game/Arts/Material/PostProcessing.mat
@ -101,7 +101,7 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Flip: {r: 1, g: 1, b: 1, a: 1}
    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
-    - _ScreenSize: {r: 1920, g: 1080, b: 0, a: 0}
+    - _ScreenSize: {r: 1097, g: 590, b: 0, a: 0}
    - _Vec4: {r: 0, g: 0, b: 0, a: 0}
    - _Wave1: {r: 1369.9567, g: 585.8363, b: 100, a: 1.0127399}
  m_BuildTextureStacks: []
--- a/Bolt/Bolt_1_4_12_NET3.unitypackage.meta
+++ b/Bolt/Bolt_1_4_12_NET3.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 90a123f7a4f086547baf326d815152f6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Bolt/Bolt_1_4_12_NET4.unitypackage.meta
+++ b/Bolt/Bolt_1_4_12_NET4.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: bc82070654869004c8e9f5a020757c96
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/client/Assets/Resources/Prefab/Effect/Pack2/HdrpPackage(post2020).unitypackage.meta
+++ b/client/Assets/Resources/Prefab/Effect/Pack2/HdrpPackage(post2020).unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 50f1930493274b44196f26fbe826b336
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/client/Assets/Resources/Prefab/Effect/Pack2/HdrpPackage(pre2020).unitypackage.meta
+++ b/client/Assets/Resources/Prefab/Effect/Pack2/HdrpPackage(pre2020).unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9ae634111ecf44747b35d691b3797c99
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/client/Assets/Resources/Prefab/Effect/Pack2/UrpPackage.unitypackage.meta
+++ b/client/Assets/Resources/Prefab/Effect/Pack2/UrpPackage.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d615676296790b64fa17dd2b0df6bee3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/client/Assets/Resources/UIRes/Battle_atlas0.png.meta
+++ b/client/Assets/Resources/UIRes/Battle_atlas0.png.meta
@ -1,8 +1,96 @@
+fileFormatVersion: 2
+guid: 6bfd180f3a7ad4d4792a78f803e1ec69
 TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
  mipmaps:
-    enableMipMap: 0
-  textureFormat: -3
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
  maxTextureSize: 2048
-  nPOTScale: 0
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/UIRes/Common_atlas0.png.meta
+++ b/client/Assets/Resources/UIRes/Common_atlas0.png.meta
@ -1,8 +1,96 @@
+fileFormatVersion: 2
+guid: 98196eef5b25a6f41806bf59446535a5
 TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
  mipmaps:
-    enableMipMap: 0
-  textureFormat: -3
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
  maxTextureSize: 2048
-  nPOTScale: 0
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/UIRes/Relic_atlas0.png.meta
+++ b/client/Assets/Resources/UIRes/Relic_atlas0.png.meta
@ -1,8 +1,96 @@
+fileFormatVersion: 2
+guid: 1c3f789930661ba4186e43887a3258bf
 TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
  mipmaps:
-    enableMipMap: 0
-  textureFormat: -3
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
  maxTextureSize: 2048
-  nPOTScale: 0
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/uiproject/assets/Battle/package.xml
+++ b/uiproject/assets/Battle/package.xml
@ -9,7 +9,7 @@
    <image id="co0b1c" name="mp_store_empty.png" path="/_Res/"/>
    <image id="co0b1f" name="lock.png" path="/_Res/"/>
    <component id="oi571o" name="Hud.xml" path="/Hud/" exported="true"/>
-    <component id="oi571q" name="Headbar.xml" path="/HeadBar/" exported="true"/>
+    <component id="oi571q" name="HeadBar.xml" path="/HeadBar/" exported="true"/>
    <component id="oi571s" name="SimpleButton.xml" path="/_Common/"/>
    <component id="oi571u" name="SimpleProgress.xml" path="/_Common/"/>
    <component id="so771v" name="Lock.xml" path="/HeadBar/Comp/"/>