挂机

2023-05-17 22:28:55 +08:00 · 2023-05-17 22:28:55 +08:00 · 168c556b6d
commit 168c556b6d
parent 9c2d1e7599
17 changed files with 2140 additions and 1576 deletions
--- a/Assets/arts/atlas/icon/item.spriteatlas
+++ b/Assets/arts/atlas/icon/item.spriteatlas
@ -73,6 +73,7 @@ SpriteAtlas:
  - {fileID: 21300000, guid: ca105ffa7d9ffc347a89f665c9e3c5e5, type: 3}
  - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3}
  - {fileID: 21300000, guid: 236fd81c35a9c1a4ca098eeeddd1821b, type: 3}
+  - {fileID: 21300000, guid: c4cb736ccf6b8be4d9846836cade4735, type: 3}
  - {fileID: 21300000, guid: 52da05fc5df88be4d8a092e24ccfa7fb, type: 3}
  - {fileID: 21300000, guid: f676744f0970161499163cc5d342e1ad, type: 3}
  m_PackedSpriteNamesToIndex:
@ -88,6 +89,7 @@ SpriteAtlas:
  - 1
  - frame_select
  - frame_2
+  - 12
  - 2
  - frame_1
  m_RenderDataMap: {}
--- a/Assets/arts/textures/background/bounty/bounty_bg_3.png
+++ b/Assets/arts/textures/background/bounty/bounty_bg_3.png
--- a/Assets/arts/textures/background/idle.meta
+++ b/Assets/arts/textures/background/idle.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e4f370b2449c05f4f8ce2d720b4f82cb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/textures/background/idle/idle_bg_1.png
+++ b/Assets/arts/textures/background/idle/idle_bg_1.png
--- a/Assets/arts/textures/background/idle/idle_bg_1.png.meta
+++ b/Assets/arts/textures/background/idle/idle_bg_1.png.meta
@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 2b070194b62cd044c8a5fa3352254800
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 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: 1
+  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
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/textures/icon/item/12.png
+++ b/Assets/arts/textures/icon/item/12.png
--- a/Assets/arts/textures/icon/item/12.png.meta
+++ b/Assets/arts/textures/icon/item/12.png.meta
@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: c4cb736ccf6b8be4d9846836cade4735
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/common/data_manager.lua.bytes
+++ b/Assets/lua/app/common/data_manager.lua.bytes
--- a/Assets/lua/app/common/module_manager.lua.bytes
+++ b/Assets/lua/app/common/module_manager.lua.bytes
--- a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes
+++ b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes
--- a/Assets/lua/app/ui/main_city/cell/side_bar_idle_cell.lua.bytes
+++ b/Assets/lua/app/ui/main_city/cell/side_bar_idle_cell.lua.bytes
--- a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes
+++ b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes
--- a/Assets/lua/app/userdata/idle.meta
+++ b/Assets/lua/app/userdata/idle.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 907fc72a4b8535c4e8b909781d2fe46a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/userdata/idle/idle_data.lua.bytes
+++ b/Assets/lua/app/userdata/idle/idle_data.lua.bytes
--- a/Assets/lua/app/userdata/idle/idle_data.lua.bytes.meta
+++ b/Assets/lua/app/userdata/idle/idle_data.lua.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3de4ba046af92cc468a0f9b149320cad
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/prefabs/ui/idle/idle_drop_ui.prefab
+++ b/Assets/prefabs/ui/idle/idle_drop_ui.prefab
--- a/Assets/prefabs/ui/tips/hero_fragment_tips.prefab
+++ b/Assets/prefabs/ui/tips/hero_fragment_tips.prefab
@ -499,7 +499,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
  m_AnchoredPosition: {x: 0, y: 23}
-  m_SizeDelta: {x: 638, y: 100}
+  m_SizeDelta: {x: 662, y: 100}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8626968315535379403
 CanvasRenderer:
@ -926,7 +926,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 3}
  m_SizeDelta: {x: 596, y: 163}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8071743606154916965
@ -1002,7 +1002,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 586, y: 680}
+  m_SizeDelta: {x: 586, y: 686}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7198605246285803238
 CanvasRenderer:
@ -1416,7 +1416,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -62}
+  m_AnchoredPosition: {x: 0, y: -59}
  m_SizeDelta: {x: 540, y: 254}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3000620699302859441