Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

Assets/Art/UIAssets/TextrueJson/bg.txt

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_herobagtop","filePath":"/bg/bg_herobagtop.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"}],"keyToValue":{}}

Assets/Art/UIAssets/bg/bg_herobagtop.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: By8Y4H+oVn3QwCxbiZzHv8x7MjNu8CKwt9gJoDLS14mTlPAAUGzy0Lw=
+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
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  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
+    maxPlaceholderSize: 32
+    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
+    maxPlaceholderSize: 32
+    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
+    maxPlaceholderSize: 32
+    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/Res/Config/HeroModelConfig.json

@@ -270,7 +270,7 @@
       "heroType": 4,
       "profession": 1,
       "itemID": null,
-      "hp": 5511,
+      "hp": 6511,
       "def": 25,
       "crit": null,
       "attack": 77,

Assets/Res/UI/HeroBagPanel.prefab

@@ -9284,6 +9284,82 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
+--- !u!1 &5932016295380193148
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3505735225816988206}
+  - component: {fileID: 6879391126004689339}
+  - component: {fileID: 6244133261738601134}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bg_herobgtop
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3505735225816988206
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5932016295380193148}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.7384, y: 0.7384, z: 0.7384}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3229002004818334900}
+  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: 916}
+  m_SizeDelta: {x: 1024, y: 512}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6879391126004689339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5932016295380193148}
+  m_CullTransparentMesh: 1
+--- !u!114 &6244133261738601134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5932016295380193148}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8e7ee5568822c374ea76814b40482b7a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5937979389209141688
 GameObject:
   m_ObjectHideFlags: 0
@@ -11102,7 +11178,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5810889576039440092}
+  - {fileID: 3505735225816988206}
   - {fileID: 4410821796019895554}
   - {fileID: 4033090060594050437}
   - {fileID: 810834646115920283}
@@ -12508,90 +12584,6 @@ Transform:
   - {fileID: 293763461181113244}
   m_Father: {fileID: 6172366767569227044}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7478066208055194432
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5810889576039440092}
-  - component: {fileID: 7795413136895754564}
-  - component: {fileID: 4983273546067815844}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: bg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5810889576039440092
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7478066208055194432}
-  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: 3229002004818334900}
-  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: 336}
-  m_SizeDelta: {x: 750, y: 1660.21}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7795413136895754564
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7478066208055194432}
-  m_CullTransparentMesh: 1
---- !u!114 &4983273546067815844
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7478066208055194432}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.053083286, g: 0.27672952, b: 0.2505042, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_00_04_06_Bg
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &7520018355582453285
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ProfessionEquipmentPanel.prefab

@@ -158,7 +158,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 188}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 807, y: 1721}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7428279825346836368
 CanvasRenderer:
@@ -2532,9 +2532,10 @@ GameObject:
   - component: {fileID: 2974061392474965578}
   - component: {fileID: 7527675708876480289}
   - component: {fileID: 378512468432709409}
+  - component: {fileID: 7195566280131233425}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: di (2)
+  m_Name: di (2)btn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2605,6 +2606,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &7195566280131233425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1803408412532527243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 378512468432709409}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1879362366171233080
 GameObject:
   m_ObjectHideFlags: 0
@@ -3363,7 +3408,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2504868283554003669}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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
@@ -3511,6 +3556,42 @@ MonoBehaviour:
     - gameObject: {fileID: 5859197848795995221}
     - gameObject: {fileID: 7203604880799864959}
     - gameObject: {fileID: 7852456645422294596}
+  - key: btnYx
+    gameObject: {fileID: 8069082766756675526}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 5495714022727717097}
+    - gameObject: {fileID: 5859197848795995221}
+    - gameObject: {fileID: 7203604880799864959}
+    - gameObject: {fileID: 7852456645422294596}
+  - key: btnMs
+    gameObject: {fileID: 7195566280131233425}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 5495714022727717097}
+    - gameObject: {fileID: 5859197848795995221}
+    - gameObject: {fileID: 7203604880799864959}
+    - gameObject: {fileID: 7852456645422294596}
+  - key: btnFs
+    gameObject: {fileID: 3504102611719733861}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 5495714022727717097}
+    - gameObject: {fileID: 5859197848795995221}
+    - gameObject: {fileID: 7203604880799864959}
+    - gameObject: {fileID: 7852456645422294596}
+  - key: btnZs
+    gameObject: {fileID: 4161267810816501358}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 5495714022727717097}
+    - gameObject: {fileID: 5859197848795995221}
+    - gameObject: {fileID: 7203604880799864959}
+    - gameObject: {fileID: 7852456645422294596}
   isAssetBundle: 1
 --- !u!1 &2586492667856005146
 GameObject:
@@ -6651,9 +6732,10 @@ GameObject:
   - component: {fileID: 4851727733700248401}
   - component: {fileID: 4449717450798219855}
   - component: {fileID: 4646557876759050064}
+  - component: {fileID: 4161267810816501358}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: di (4)
+  m_Name: di (4)btn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -6724,6 +6806,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &4161267810816501358
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349337104007731381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4646557876759050064}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5436245460284797460
 GameObject:
   m_ObjectHideFlags: 0
@@ -7614,9 +7740,10 @@ GameObject:
   - component: {fileID: 7706277172685388351}
   - component: {fileID: 1310734492756761015}
   - component: {fileID: 6954974701142317641}
+  - component: {fileID: 3504102611719733861}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: di (3)
+  m_Name: di (3)btn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7687,6 +7814,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &3504102611719733861
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6039736752582846116}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6954974701142317641}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6058801049487964470
 GameObject:
   m_ObjectHideFlags: 0
@@ -8430,9 +8601,10 @@ GameObject:
   - component: {fileID: 4914127930655449212}
   - component: {fileID: 813291560188171718}
   - component: {fileID: 4096575373383281215}
+  - component: {fileID: 8069082766756675526}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: di (1)
+  m_Name: di (1)btn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8503,6 +8675,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &8069082766756675526
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6816295656083329833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4096575373383281215}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6824560005494573809
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -127,15 +127,35 @@ namespace GameLogic.Bag
             ItemInfo item = GetItemInfo(itemId);
             return AddItem(item, count);
         }
-
+        
+        /// <summary>
+        /// 添加道具，最后都走这里
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        private bool AddItem(ItemInfo item, long count)
+        {
+            if (item.config.ID <= 0 && string.IsNullOrEmpty(item.guid))
+            {
+                return false;
+            }
+            item.count += count;
+            EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() {ItemInfo = item});
+            
+            AccountFileInfo.Instance.SaveItemData(item);
+            return true;
+        }
+        
         /// <summary>
         /// 添加装备道具
         /// </summary>
         /// <param name="item"></param>
         public void AddEquipmentItem(ItemInfo item)
         {
+            long count = item.count.Value;
             ItemInfo eqItemInfo = GetItemInfoWithGuid(item);
-            AddItem(eqItemInfo, item.count.Value);
+            AddItem(eqItemInfo, count);
         }
         
         public ItemInfo GetItemInfoWithGuid(ItemInfo itemInfo)
@@ -151,36 +171,15 @@ namespace GameLogic.Bag
 
             if (!string.IsNullOrEmpty(itemInfo.guid))
             {
+                //这里要设成0是因为，装备已经掉出来了，有了数量，第一次进背包时，先把数量去掉（否则会掉一个得2个）
+                //接下来会加回去，看后续代码。
+                itemInfo.count.Value = 0;
                 m_bagList.Add(itemInfo);
             }
             return itemInfo;
         }
         
         
-        /// <summary>
-        /// 添加道具，最后都走这里
-        /// </summary>
-        /// <param name="item"></param>
-        /// <param name="count"></param>
-        /// <returns></returns>
-        private bool AddItem(ItemInfo item, long count)
-        {
-            if (item.config.ID <= 0 && string.IsNullOrEmpty(item.guid))
-            {
-                return false;
-            }
-
-            // if (!string.IsNullOrEmpty(item.guid))
-            // {
-            //     
-            // }
-            
-            item.count += count;
-            EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() {ItemInfo = item});
-            AccountFileInfo.Instance.SaveItemData(item);
-            return true;
-        }
-        
         /// <summary>
         /// 扣除道具,最后都这里
         /// </summary>
@@ -222,7 +221,7 @@ namespace GameLogic.Bag
             for (int i = 0; i < m_bagList.Count; i++)
             {
                 ItemInfo item = m_bagList[i];
-                if (item.ID == itemId)
+                if (item.itemID == itemId)
                 {
                     return item;
                 }

Assets/Scripts/GameLogic/Bag/ItemInfo.cs

@@ -7,7 +7,8 @@ namespace GameLogic.Bag
 {
     public class ItemInfo
     {
-        public int ID;
+        public readonly int itemID;
+        // public int itemID;
         public string guid;
         public EncryptionLong count;
 
@@ -20,13 +21,13 @@ namespace GameLogic.Bag
 
         public EquipmentInfo eqInfo;
 
-        public ItemInfo(int ID, long count = 0)
+        public ItemInfo(int itemID, long count = 0)
         {
-            this.ID = ID;
-            guid = ID.ToString();
+            this.itemID = itemID;
+            guid = itemID.ToString();
             this.count = (EncryptionLong)count;
 
-            config = ConfigComponent.Instance.Get<ItemConfig>(ID);
+            config = ConfigComponent.Instance.Get<ItemConfig>(itemID);
         }
 
         public ItemInfo(DropItemConfig dropItemConfig)
@@ -36,20 +37,22 @@ namespace GameLogic.Bag
 
         public ItemInfo(AccountFileInfo.ItemData itemData)
         {
-            ID = itemData.itemId;
+            itemID = itemData.itemId;
             count = (EncryptionLong)itemData.itemCount;
-            config = ConfigComponent.Instance.Get<ItemConfig>(ID);
+            config = ConfigComponent.Instance.Get<ItemConfig>(itemID);
             guid = itemData.guid;
         }
 
         public AccountFileInfo.ItemData ToItemData()
         {
-            return new AccountFileInfo.ItemData()
+            AccountFileInfo.ItemData itemData = new AccountFileInfo.ItemData(itemID, count.Value, guid);
+
+            if (eqInfo != null)
             {
-                itemId = ID,
-                itemCount = count.Value,
-                guid = guid
-            };
+                itemData.eqData = eqInfo.ToData();
+            }
+            
+            return itemData;
         }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -98,7 +98,7 @@ namespace GameLogic.Combat.CombatType
         /// </summary>
         private void EntityDropLogic(CombatHeroEntity combatHeroEntity)
         {
-            return;
+            // return;
             List<ItemInfo> equipmentList = DropManager.Instance.
                 DropEquipment(_levelBattleConfig, combatHeroEntity.CurrCombatHeroInfo.heroType);
 

Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs

@@ -70,9 +70,10 @@ namespace GameLogic.Equipment
             int equipmentConfigID =
                 GlobalParam.GenerateEquipmentID(itemConfig.itemParam[0], itemConfig.itemParam[1], eLv,
                     PlayerManager.Instance.heroController.mainLevel);
-            level = eLv;
+            
             
             basicEquipConfig = ConfigComponent.Instance.Get<HeroBasicEquipConfig>(equipmentConfigID);
+            level = basicEquipConfig.lv;
             // guid = GlobalParam.GenerateGUID();
             myItemInfo.guid = itemConfig.ID.ToString() + basicEquipConfig.lv + quality;
             CalAtt();
@@ -107,8 +108,8 @@ namespace GameLogic.Equipment
         {
             AccountFileInfo.EqData eqData = new AccountFileInfo.EqData
             {
-                guid = guid,
-                count = count,
+                // guid = guid,
+                // count = count,
                 itemConfigID = itemConfig.ID,
                 level = level,
                 quality = quality,

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -29,7 +29,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// <summary>
         /// 装备列表
         /// </summary>
-        public List<EqData> EqListData = new List<EqData>();
+        // public List<EqData> EqListData = new List<EqData>();
 
         /// <summary>
         /// 关卡进度
@@ -147,6 +147,9 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
                 return;
             }
         }
+        
+        playerData.ItemListData.Add(itemInfo.ToItemData());
+        SavePlayerData();
     }
 
     public void SaveEqGUID()
@@ -192,23 +195,11 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// </summary>
     public void ClearInitPlayerData()
     {
-        ItemData coin = new ItemData()
-        {
-            itemId = GlobalParam.Item_Coin_ID,
-            itemCount = 0,
-        };
+        ItemData coin = new ItemData(GlobalParam.Item_Coin_ID);
 
-        ItemData diamond = new ItemData()
-        {
-            itemId = GlobalParam.Item_Diamond_ID,
-            itemCount = 0,
-        };
+        ItemData diamond = new ItemData(GlobalParam.Item_Diamond_ID);
 
-        ItemData heroExp = new ItemData()
-        {
-            itemId = GlobalParam.Item_HeroExp_ID,
-            itemCount = 0,
-        };
+        ItemData heroExp = new ItemData(GlobalParam.Item_HeroExp_ID);
 
         playerData.ItemListData.Add(coin);
         playerData.ItemListData.Add(diamond);
@@ -281,6 +272,24 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public int itemId;
         public long itemCount;
         public string guid;
+
+        public EqData eqData;
+
+        public ItemData(int itemId, long itemCount = 0, string guid = "")
+        {
+            this.itemId = itemId;
+            this.itemCount = itemCount;
+            if (string.IsNullOrEmpty(guid))
+            {
+                this.guid = itemId.ToString();
+            }
+            else
+            {
+                this.guid = guid;
+            }
+
+            // eqData = null;
+        }
     }
     
     /// <summary>
@@ -289,8 +298,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     [System.Serializable]
     public class EqData
     {
-        public string guid;
-        public int count;
+        // public string guid;
+        // public int count;
         public int itemConfigID;
         public int level;
         public int quality;

Assets/Scripts/GameUI/UI/Hero/HeroBag.cs

@@ -1,20 +0,0 @@
-namespace Fort23.Mono
-{
-[UIBinding(prefab = "HeroBag"  )]
-	public partial class HeroBag : UIPanel
-	{
-	private void Init()
-	{
-	}
-	protected override void AddEvent()
-	{
-	}
-	protected override void DelEvent()
-	{
-	}
-	public override void AddButtonEvent()
-	{
-	}
-
-	}
-}

Assets/Scripts/GameUI/UI/Hero/HeroBagPanel.cs

@@ -25,8 +25,15 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             btnBack.onClick.AddListener(OnclickClose);
+            btnEquip.onClick.AddListener(OnclickEquipment);
         }
-        
+
+        private async void OnclickEquipment()
+        {
+            ProfessionEquipmentPanel professionEquipmentPanel = await UIManager.Instance.LoadAndOpenPanel<ProfessionEquipmentPanel>(null);
+            professionEquipmentPanel.InitPanel();
+        }
+
         private void OnMainLvUp(IEventData e)
         {
             // SimpleEventData data = e as SimpleEventData;

Assets/Scripts/GameUI/UI/Hero/ProfessionEquipmentPanel.cs

@@ -1,20 +1,66 @@
 namespace Fort23.Mono
 {
-[UIBinding(prefab = "ProfessionEquipmentPanel"  )]
-	public partial class ProfessionEquipmentPanel : UIPanel
-	{
-	private void Init()
-	{
-	}
-	protected override void AddEvent()
-	{
-	}
-	protected override void DelEvent()
-	{
-	}
-	public override void AddButtonEvent()
-	{
-	}
+    [UIBinding(prefab = "ProfessionEquipmentPanel"  )]
+    public partial class ProfessionEquipmentPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+        protected override void AddEvent()
+        {
+        }
+        protected override void DelEvent()
+        {
+        }
+        public override void AddButtonEvent()
+        {
+            btnBack.onClick.AddListener(OnclickBack);
+            btnZs.onClick.AddListener(OnclickZS);
+            btnFs.onClick.AddListener(OnclickFS);
+            btnMs.onClick.AddListener(OnclickMS);
+            btnYx.onClick.AddListener(OnclickYX);
+        }
 
-	}
-}
+        private async void OnclickZS()
+        {
+            OpenSpecificProfessionEquipmentPanel(1);
+        }
+        
+        private async void OnclickFS()
+        {
+            OpenSpecificProfessionEquipmentPanel(2);
+        }
+        
+        private async void OnclickMS()
+        {
+            OpenSpecificProfessionEquipmentPanel(3);
+        }
+        
+        private async void OnclickYX()
+        {
+            OpenSpecificProfessionEquipmentPanel(4);
+        }
+
+        /// <summary>
+        /// 打开对应职业的装备面板
+        /// </summary>
+        /// <param name="zy">1战士；2法师；3牧师；4游侠</param>
+        private async void OpenSpecificProfessionEquipmentPanel(int zy)
+        {
+            SpecificProfessionEquipmentPanel specificProfessionEquipmentPanel 
+                = await UIManager.Instance.LoadAndOpenPanel<SpecificProfessionEquipmentPanel>(null);
+            specificProfessionEquipmentPanel.InitPanel(zy);
+        }
+
+        private void OnclickBack()
+        {
+            UIManager.Instance.HideUIUIPanel(this);
+        }
+
+        public void InitPanel()
+        {
+            
+        }
+
+    }
+}

Assets/Scripts/GameUI/UI/Hero/ProfessionEquipmentPanelData.cs

@@ -63,6 +63,50 @@ namespace Fort23.Mono
 	      return _allEquipment;
 	     }
 	   }
+	  private Button _btnYx;
+	  public Button btnYx
+	   {
+	   get{
+	      if (_btnYx == null)
+	       {
+	         _btnYx  = GetUIUnit<Button>("btnYx"); 
+	       }
+	      return _btnYx;
+	     }
+	   }
+	  private Button _btnMs;
+	  public Button btnMs
+	   {
+	   get{
+	      if (_btnMs == null)
+	       {
+	         _btnMs  = GetUIUnit<Button>("btnMs"); 
+	       }
+	      return _btnMs;
+	     }
+	   }
+	  private Button _btnFs;
+	  public Button btnFs
+	   {
+	   get{
+	      if (_btnFs == null)
+	       {
+	         _btnFs  = GetUIUnit<Button>("btnFs"); 
+	       }
+	      return _btnFs;
+	     }
+	   }
+	  private Button _btnZs;
+	  public Button btnZs
+	   {
+	   get{
+	      if (_btnZs == null)
+	       {
+	         _btnZs  = GetUIUnit<Button>("btnZs"); 
+	       }
+	      return _btnZs;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanel.cs

@@ -1,20 +1,31 @@
 namespace Fort23.Mono
 {
-[UIBinding(prefab = "SpecificProfessionEquipmentPanel"  )]
-	public partial class SpecificProfessionEquipmentPanel : UIPanel
-	{
-	private void Init()
-	{
-	}
-	protected override void AddEvent()
-	{
-	}
-	protected override void DelEvent()
-	{
-	}
-	public override void AddButtonEvent()
-	{
-	}
+    [UIBinding(prefab = "SpecificProfessionEquipmentPanel"  )]
+    public partial class SpecificProfessionEquipmentPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+        protected override void AddEvent()
+        {
+        }
+        protected override void DelEvent()
+        {
+        }
+        public override void AddButtonEvent()
+        {
+            btnBack.onClick.AddListener(OnclickClose);
+        }
 
-	}
-}
+        private void OnclickClose()
+        {
+            UIManager.Instance.HideUIUIPanel(this);
+        }
+
+        public void InitPanel(int zy)
+        {
+		
+        }
+
+    }
+}

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanelData.cs

@@ -0,0 +1,84 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class SpecificProfessionEquipmentPanel 
+	{
+	  #region 自定义数据 
+	  private Button _btnBack;
+	  public Button btnBack
+	   {
+	   get{
+	      if (_btnBack == null)
+	       {
+	         _btnBack  = GetUIUnit<Button>("btnBack"); 
+	       }
+	      return _btnBack;
+	     }
+	   }
+	  private Button _btnRecycle;
+	  public Button btnRecycle
+	   {
+	   get{
+	      if (_btnRecycle == null)
+	       {
+	         _btnRecycle  = GetUIUnit<Button>("btnRecycle"); 
+	       }
+	      return _btnRecycle;
+	     }
+	   }
+	  private GameObject _btnYx;
+	  public GameObject btnYx
+	   {
+	   get{
+	      if (_btnYx == null)
+	       {
+	         _btnYx  = GetUIUnit<GameObject>("btnYx"); 
+	       }
+	      return _btnYx;
+	     }
+	   }
+	  private GameObject _btnMs;
+	  public GameObject btnMs
+	   {
+	   get{
+	      if (_btnMs == null)
+	       {
+	         _btnMs  = GetUIUnit<GameObject>("btnMs"); 
+	       }
+	      return _btnMs;
+	     }
+	   }
+	  private GameObject _btnFs;
+	  public GameObject btnFs
+	   {
+	   get{
+	      if (_btnFs == null)
+	       {
+	         _btnFs  = GetUIUnit<GameObject>("btnFs"); 
+	       }
+	      return _btnFs;
+	     }
+	   }
+	  private GameObject _btnZs;
+	  public GameObject btnZs
+	   {
+	   get{
+	      if (_btnZs == null)
+	       {
+	         _btnZs  = GetUIUnit<GameObject>("btnZs"); 
+	       }
+	      return _btnZs;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/Hero/HeroBag.cs.meta → Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanelData.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WS4ftyz/Vnq/MPgkNgTDmHLpxJGuVb171JK8CwUu+GPvjHPm7b/J5lU=
+guid: CS9MsSmlWyoYTxxxdEalr/+I5SYulBRSCOiLku5HyQ16wtvXZKb8ILw=
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -98,16 +98,16 @@ namespace Fort23.Mono
         private void OnItemUpdate(IEventData e)
         {
             ItemUpdateData data = e as ItemUpdateData;
-            if (data.ItemInfo.ID == GlobalParam.Item_Coin_ID)
+            if (data.ItemInfo.itemID == GlobalParam.Item_Coin_ID)
             {
                 txtCoin.text = BagController.Instance.GetItemInfo(GlobalParam.Item_Coin_ID).count.Value.ToStringEx();
             }
-            else if (data.ItemInfo.ID == GlobalParam.Item_Diamond_ID)
+            else if (data.ItemInfo.itemID == GlobalParam.Item_Diamond_ID)
             {
                 txtDiamond.text = BagController.Instance.GetItemInfo(GlobalParam.Item_Diamond_ID).count.Value
                     .ToStringEx();
             }
-            else if (data.ItemInfo.ID == GlobalParam.Item_HeroExp_ID)
+            else if (data.ItemInfo.itemID == GlobalParam.Item_HeroExp_ID)
             {
                 txtHeroExp.text = BagController.Instance.GetItemInfo(GlobalParam.Item_HeroExp_ID).count.Value
                     .ToStringEx();

UserSettings/EditorUserSettings.asset

@@ -27,25 +27,25 @@ EditorUserSettings:
       value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5604565200030f5d5d575c7a417b5a44404f1e292e7125672c7b1f63e7b96269
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5604565200030f5d5d575c7a417b5a44404f1e292e7125672c7b1f63e7b96269
+      value: 0009555e5400515f590b097412770f1140161d2b7d2977642e2b4a63b1e5636d
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 0009555e5400515f590b097412770f1140161d2b7d2977642e2b4a63b1e5636d
+      value: 0509560200060a0c5908552040750b44444f1a7a2a7827327c2a1e63b3b4603c
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 0509560200060a0c5908552040750b44444f1a7a2a7827327c2a1e63b3b4603c
+      value: 020600005157590b5e595b7313215b44424e4b7f7b2b70337479486be6b46d39
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 020600005157590b5e595b7313215b44424e4b7f7b2b70337479486be6b46d39
+      value: 5455050750515e025d5f5b2342770f4212164878792d2462282a4a62b1e5603d
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5455050750515e025d5f5b2342770f4212164878792d2462282a4a62b1e5603d
+      value: 0600055050050c595f0c097146200b44464f4c2f7c2c24627b2a4d35e6e4366c
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 0600055050050c595f0c097146200b44464f4c2f7c2c24627b2a4d35e6e4366c
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68

美术/unity_use_ui/TextrueJson/bg.txt

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_herobagtop","filePath":"/bg/bg_herobagtop.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"}],"keyToValue":{}}