Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/UIAssets/decorate/dec_yuanjiao8.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 10, y: 10, z: 11, w: 9}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/Art/VFX/UIFXprefab/fx_ui_fb_shifang.prefab

@@ -14843,6 +14843,7 @@ GameObject:
   - component: {fileID: 9208752300289060059}
   - component: {fileID: 7744140961957142694}
   - component: {fileID: 2857859061041703734}
+  - component: {fileID: 7724964501925074849}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: fx_ui_fb_shifang
@@ -14930,3 +14931,15 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!225 &7724964501925074849
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7791877488189017737}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 0
+  m_IgnoreParentGroups: 0

Assets/Res/Config/EventConditionConfig.json

@@ -8,13 +8,7 @@
       "ConditionPara": [
         1001
       ],
-      "finishCount": 10,
-      "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
-      ]
+      "finishCount": 10
     },
     {
       "ID": 2,
@@ -26,10 +20,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -45,10 +36,7 @@
         9031
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -59,13 +47,7 @@
       "ConditionPara": [
         1002
       ],
-      "finishCount": 10,
-      "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
-      ]
+      "finishCount": 10
     },
     {
       "ID": 5,
@@ -84,10 +66,7 @@
       "ConditionType": 9,
       "finishCount": 6,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -100,10 +79,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -116,10 +92,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -135,10 +108,7 @@
         30003
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -154,10 +124,7 @@
         30004
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -173,10 +140,7 @@
         30011
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -192,10 +156,7 @@
         30005
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -211,10 +172,7 @@
         30006
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -227,10 +185,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -246,10 +201,7 @@
         30007
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -265,10 +217,7 @@
         30008
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -284,10 +233,7 @@
         30009
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -303,10 +249,7 @@
         30010
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -319,10 +262,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -335,10 +275,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -351,10 +288,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -367,10 +301,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -383,10 +314,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -399,10 +327,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -415,10 +340,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -431,10 +353,7 @@
       ],
       "finishCount": 3,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -447,10 +366,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -463,10 +379,7 @@
       ],
       "finishCount": 5,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -479,10 +392,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -495,10 +405,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -511,10 +418,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -527,10 +431,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -543,10 +444,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -559,10 +457,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        3
       ]
     },
     {
@@ -575,10 +470,7 @@
       ],
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -591,10 +483,7 @@
       ],
       "finishCount": 3,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -610,10 +499,7 @@
         30014
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -629,10 +515,7 @@
         30015
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -648,10 +531,7 @@
         30016
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -667,10 +547,7 @@
         30017
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -686,10 +563,7 @@
         30018
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -705,10 +579,7 @@
         30019
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -724,10 +595,7 @@
         30020
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -743,10 +611,7 @@
         30021
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -762,10 +627,7 @@
         30022
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -781,10 +643,7 @@
         9141
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {
@@ -800,10 +659,7 @@
         9143
       ],
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     }
   ]

Assets/Res/Config/GroupConfig.json

@@ -392,7 +392,7 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        205
+        200
       ],
       "GroupMonster": [
         9005

Assets/Res/Config/HeroModelConfig.json

@@ -1239,7 +1239,7 @@
       "skillID": [
         2005,
         1404,
-        2002,
+        2006,
         1401,
         2007,
         -1,
@@ -1261,9 +1261,9 @@
         1
       ],
       "fa_bao_id": [
-        10007,
-        10010,
         10002,
+        10010,
+        10007,
         10004
       ],
       "fabaoActiveLv": [

Assets/Res/UI/CombatPanel.prefab

@@ -9703,7 +9703,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: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 375, y: -323.95743}
+  m_AnchoredPosition: {x: 375, y: -159.055}
   m_SizeDelta: {x: 515.9872, y: 132}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6068152967228935904
@@ -554,7 +554,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 2.9073}
-  m_SizeDelta: {x: 750, y: 647.9149}
+  m_SizeDelta: {x: 750, y: 318.11}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8233105199315588399
 CanvasRenderer:
@@ -571,7 +571,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2810378908186672879}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -661,7 +661,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: 647.9149
+  m_MinHeight: 318.11
   m_PreferredWidth: -1
   m_PreferredHeight: -1
   m_FlexibleWidth: -1

Assets/Res/UI/XianTuLogPanel/仙途日志-支线.png.meta → Assets/Res/UI/ShopPanel/购买弹窗.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: W3gX4Xz/UXzxcqP9+obxl6mrSWeAx6R8gBmYxn4HjnNgnIeZr1m7myll6srV
+guid: W3IasCr8VXPJMClqKcirkzeZAK2kyowFO4/k7WgrVTe3ElyfPA4/H4Dy+/6p
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u4ED9\u9014\u65E5\u5FD7-\u652F\u7EBF"
+  assetBundleName: 
   assetBundleVariant: 

Assets/Res/UI/XianTuLogPanel/EventLogMessageWidget.prefab

@@ -144,7 +144,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 373.62665, y: -43}
+  m_AnchoredPosition: {x: 373.62665, y: -0}
   m_SizeDelta: {x: 635.2533, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1334102890352701418

Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -3153,7 +3153,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2541634502081460392, guid: 034392a467bb69a46b538612078936bc, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 126
       objectReference: {fileID: 0}
     - target: {fileID: 2541634502081460392, guid: 034392a467bb69a46b538612078936bc, type: 3}
       propertyPath: m_AnchoredPosition.x

Assets/Res/UI/XianTuLogPanel/仙途日志-主线.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DntNvCOtUH+rJM3FW+pJ9uqS3ENmaIrlxHTfJjF4gupYsNEtmMh4a1Wea7/3
-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: 0
-  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
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: Android
-    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: WeixinMiniGame
-    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: HMIAndroid
-    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: OpenHarmony
-    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: "\u4ED9\u9014\u65E5\u5FD7-\u4E3B\u7EBF"
-  assetBundleVariant: 

Assets/Res/UI/XianTuLogPanel/仙途日志-回顾.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: BitMvHmlVXjAhGETKImXI4/UU72cb36ddvDNq3nVcj78UKydPj6/a0xRAcUO
-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: 0
-  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
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: Android
-    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: WeixinMiniGame
-    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: HMIAndroid
-    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: OpenHarmony
-    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: "\u4ED9\u9014\u65E5\u5FD7-\u56DE\u987E"
-  assetBundleVariant: 

Assets/Res/UIAtlas/shop.spriteatlasv2

@@ -17,6 +17,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 0125b55a51fb3ee48b7cc584072a0304, type: 3}
     - {fileID: 2800000, guid: 0ef0b78b7aff1f54e833b1e91e98dc21, type: 3}
     - {fileID: 2800000, guid: 06922ce6f81854c42a9bc491ab2bea42, type: 3}
+    - {fileID: 2800000, guid: eabe391634fcf4f46930cba522b1af94, type: 3}
     - {fileID: 2800000, guid: 4f99fad8f63aec3428346ac500564ce5, type: 3}
     - {fileID: 2800000, guid: f821b8b71b58dc742be75d333d3fbe72, type: 3}
     - {fileID: 2800000, guid: bbc3117b91c472448acb5f8c7d3f8f64, type: 3}

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -0.0000014305115, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -796,10 +796,10 @@ public class EventSystemManager : Singleton<EventSystemManager>
             divineSenceEventPreviewPanel.GObjectPoolInterface.SetActive(false);
         }
 
-        if (appBarPanel != null && !appBarPanel.IsClose)
-        {
-            appBarPanel.GObjectPoolInterface.SetActive(false);
-        }
+        // if (appBarPanel != null && !appBarPanel.IsClose)
+        // {
+        //     appBarPanel.GObjectPoolInterface.SetActive(false);
+        // }
 
         // if (divineSenceInfoPanel != null)
         // {

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -37,12 +37,21 @@ namespace Fort23.Mono
             {
                 UIManager.Instance.DormancyGComponent(itemDetailsWidget);
             }
+
             itemDetailsWidgets.Clear();
-            
+
             itemInfo = uiData[0] as ItemInfo;
 
             Text_Name.text = LanguageManager.Instance.Text(itemInfo.config.itemName);
-            Text_Desc.text = LanguageManager.Instance.Text(itemInfo.config.itemDesc2);
+            if (itemInfo.config.itemDesc2 == 0)
+            {
+                Text_Desc.text = "";
+            }
+            else
+            {
+                Text_Desc.text = LanguageManager.Instance.Text(itemInfo.config.itemDesc2);
+            }
+
             WidgetItem widgetItem =
                 await UIManager.Instance.CreateGComponentForObject<WidgetItem>(WidgetItemGame, null);
             widgetItem.InitWidget(itemInfo, false);

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -20,7 +20,7 @@ namespace Fort23.Mono
         List<PlacesInfoWidget> placesInfoWidgets = new List<PlacesInfoWidget>();
 
         private Action<bool> callBack;
-        private bool isChange;
+        public bool isChange;
 
         private void Init()
         {
@@ -47,7 +47,6 @@ namespace Fort23.Mono
             callBack = uiData[1] as Action<bool>;
 
             isChange = false;
-            // smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlacesId);
             placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(PlacesId);
 
             foreach (var placesConfigSmallPlacersId in placesConfig.SmallPlacersIds)

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoWidget.cs

@@ -67,6 +67,11 @@ namespace Fort23.Mono
                     return;
                 }
 
+                PlacesInfoPanel placesInfoPanel = UIManager.Instance.GetComponent<PlacesInfoPanel>();
+                if (placesInfoPanel != null && !placesInfoPanel.IsClose)
+                {
+                    placesInfoPanel.isChange = true;
+                }
 
                 SmallPlacesConfig currentSmallPlacesConfig =
                     ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
@@ -102,6 +107,12 @@ namespace Fort23.Mono
                 //解锁下一个地图
                 if (currentSmallPlacesData == null && IsSmallPlacesDataUlock(smallPlacesConfig.ID))
                 {
+                    PlacesInfoPanel placesInfoPanel = UIManager.Instance.GetComponent<PlacesInfoPanel>();
+                    if (placesInfoPanel != null && !placesInfoPanel.IsClose)
+                    {
+                        placesInfoPanel.isChange = true;
+                    }
+
                     await UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
                     await UIManager.Instance.HideUIUIPanel<PlacesInfoPanel>();
 

Assets/Scripts/GameUI/UI/XianTuLogPanel/EventLogWidget.cs

@@ -31,32 +31,54 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             base.AddButtonEvent();
-            Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(2,_xianTuLogConfig.ID); });
+            Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(2, _xianTuLogConfig.ID); });
         }
 
-        public async CTask CustomInit( XianTuData xianTuData, List<int> places)
+        public async CTask CustomInit(XianTuData xianTuData, List<int> places)
         {
             XianTuData = xianTuData;
             _xianTuLogConfig = xianTuData.xianTuLogConfig;
             Text_Title.text = LanguageManager.Instance.Text(_xianTuLogConfig.Title);
-            Text_Desc.text = LanguageManager.Instance.Text(_xianTuLogConfig.Desc);
+
+
+            bool isUlock = false;
 
             if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(_xianTuLogConfig.ID))
             {
                 var configs = EventSystemManager.Instance.eventConfigsMap[_xianTuLogConfig.ID];
                 foreach (var eventConfig in configs)
                 {
-                    AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                    AccountFileInfo.EventList eventList =
+                        AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl =>
+                            cl.eventID == eventConfig.ID);
                     if (eventList == null)
                     {
-                        eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                        eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(cl =>
+                            cl.eventID == eventConfig.ID);
                     }
-                    EventMinLogWidget eventMinLogWidget = await UIManager.Instance.CreateGComponent<EventMinLogWidget>(null, Connect);
-                    eventMinLogWidget.CustomInit(eventConfig.ID, eventList,places);
+
+                    if (eventList != null && eventList.isCompleted)
+                    {
+                        isUlock = true;
+                    }
+
+                    EventMinLogWidget eventMinLogWidget =
+                        await UIManager.Instance.CreateGComponent<EventMinLogWidget>(null, Connect);
+                    eventMinLogWidget.CustomInit(eventConfig.ID, eventList, places);
                     eventMinLogWidgets.Add(eventMinLogWidget);
                 }
             }
 
+            if (isUlock)
+            {
+                Text_Desc.text = LanguageManager.Instance.Text(_xianTuLogConfig.Desc);
+            }
+            else
+            {
+                Text_Desc.text = "?????????????????";
+            }
+
+
             LayoutRebuilder.ForceRebuildLayoutImmediate(Connect);
             LayoutRebuilder.ForceRebuildLayoutImmediate(Connect.transform.parent.GetComponent<RectTransform>());
         }
@@ -71,7 +93,7 @@ namespace Fort23.Mono
             eventMinLogWidgets.Clear();
 
             XianTuData = null;
-            
+
             base.DormancyObj();
         }
     }

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,78 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: -1080
+    y: 533
+    width: 829
+    height: 521
+  m_ShowMode: 0
+  m_Title: Animation
+  m_RootView: {fileID: 6}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: -2553
+    y: 314
+    width: 1343
+    height: 1078
+  m_ShowMode: 0
+  m_Title: Console
+  m_RootView: {fileID: 8}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 167
+    y: 105
+    width: 684
+    height: 1229
+  m_ShowMode: 0
+  m_Title: Game
+  m_RootView: {fileID: 10}
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +86,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 1372
-    y: 116
-    width: 918
-    height: 1062
+    x: 0
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Console
-  m_RootView: {fileID: 4}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 11}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
---- !u!114 &2
+  m_Maximized: 1
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -34,24 +106,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: AnimationWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 409
-    width: 460
-    height: 603
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 10}
+    y: 0
+    width: 829
+    height: 521
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 11}
-  - {fileID: 10}
-  m_Selected: 1
+  - {fileID: 19}
+  m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -64,20 +135,121 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 2}
+  - {fileID: 5}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 829
+    height: 521
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 32255
+  draggingID: 0
+--- !u!114 &7
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 458
+    x: 0
     y: 0
-    width: 460
-    height: 1012
+    width: 1343
+    height: 1078
   m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 43
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
+  m_Panes:
+  - {fileID: 20}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &8
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 7}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1343
+    height: 1078
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 26065
   draggingID: 0
---- !u!114 &4
+--- !u!114 &9
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 684
+    height: 1229
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 25}
+  m_Panes:
+  - {fileID: 25}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &10
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 9}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 684
+    height: 1229
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 18
+  draggingID: 0
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -90,22 +262,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
-  - {fileID: 6}
-  - {fileID: 7}
+  - {fileID: 12}
+  - {fileID: 13}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 918
-    height: 1062
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &5
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -122,12 +294,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 918
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &6
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -140,20 +312,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 3}
+  - {fileID: 18}
+  - {fileID: 15}
+  - {fileID: 16}
+  - {fileID: 17}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 918
-    height: 1012
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 42
+  controlID: 54
   draggingID: 0
---- !u!114 &7
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -169,12 +343,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1042
-    width: 918
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &8
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -184,24 +358,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1209
     y: 0
-    width: 460
-    height: 409
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 13}
+    width: 411
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 12}
-  - {fileID: 13}
-  m_Selected: 1
+  - {fileID: 22}
+  m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -211,24 +384,113 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 1620
+    y: 0
+    width: 542
+    height: 1299
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
+  m_ActualView: {fileID: 24}
+  m_Panes:
+  - {fileID: 24}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &17
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 2162
+    y: 0
+    width: 398
+    height: 1299
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 23}
+  m_Panes:
+  - {fileID: 23}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &18
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 458
-    height: 1012
+    width: 1209
+    height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 26}
   m_Panes:
-  - {fileID: 15}
-  - {fileID: 14}
-  m_Selected: 1
-  m_LastSelected: 0
---- !u!114 &10
+  - {fileID: 26}
+  - {fileID: 21}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &19
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12071, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Animation
+    m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: -1080
+    y: 533
+    width: 829
+    height: 500
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_LockTracker:
+    m_IsLocked: 0
+  m_LastSelectedObjectID: -978588
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -248,10 +510,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1830
-    y: 555
-    width: 459
-    height: 582
+    x: -2553
+    y: 314
+    width: 1343
+    height: 1057
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -262,7 +524,94 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &11
+--- !u!114 &21
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12914, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Animator
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ViewTransforms:
+    m_KeySerializationHelper:
+    - {fileID: -7946071565220439783, guid: 497239a8d5fe4f84eb17a2d46596f013, type: 2}
+    - {fileID: -286912451515267344, guid: edf91e3e885f22347b39b4067f6fabac, type: 2}
+    m_ValueSerializationHelper:
+    - e00: 0.80315787
+      e01: 0
+      e02: 0
+      e03: -25.157867
+      e10: 0
+      e11: 0.80315787
+      e12: 0
+      e13: 531.15265
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    - e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+  m_PreviewAnimator: {fileID: 0}
+  m_AnimatorController: {fileID: 9100000, guid: 497239a8d5fe4f84eb17a2d46596f013, type: 2}
+  m_BreadCrumbs:
+  - m_Target: {fileID: -7946071565220439783, guid: 497239a8d5fe4f84eb17a2d46596f013, type: 2}
+    m_ScrollPosition: {x: 0, y: 0}
+  stateMachineGraph: {fileID: 0}
+  stateMachineGraphGUI: {fileID: 0}
+  blendTreeGraph: {fileID: 0}
+  blendTreeGraphGUI: {fileID: 0}
+  m_AutoLiveLink: 1
+  m_MiniTool: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_CurrentEditor: 0
+  m_LayerEditor:
+    m_SelectedLayerIndex: 0
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -282,10 +631,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 684
-    y: 528
-    width: 588
-    height: 605
+    x: 1209
+    y: 73
+    width: 409
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -299,9 +648,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: faf70000
-      m_LastClickedID: 0
-      m_ExpandedIDs: 48daffff
+      m_SelectedIDs: 6411f1ff
+      m_LastClickedID: -978588
+      m_ExpandedIDs: ca47f1ffdc47f1ff98b3f9ffaab3f9fff020fcfff420fcff0621fcff66faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -317,7 +666,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 0}
+        m_ClientGUIView: {fileID: 15}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -325,7 +674,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &12
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -345,10 +694,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 617
-    y: 122
-    width: 459
-    height: 388
+    x: 2162
+    y: 73
+    width: 397
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -362,7 +711,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: -160
+    m_CachedPref: 486
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -372,7 +721,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &13
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -392,10 +741,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1830
-    y: 146
-    width: 459
-    height: 388
+    x: 1620
+    y: 73
+    width: 540
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -407,7 +756,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: gamer
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -417,24 +766,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/ThirdParty/Crasheye
+    - Assets/Res/UI/ShopPanel
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: gamer
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/ThirdParty/Crasheye
+  - Assets/Res/UI/ShopPanel
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\UGit\XiuXianGame
+  m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 608}
-    m_SelectedIDs: b46a0000
-    m_LastClickedID: 27316
-    m_ExpandedIDs: 00000000c8fc0000720401007a0401000205010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 534}
+    m_SelectedIDs: 02600100
+    m_LastClickedID: 90114
+    m_ExpandedIDs: 000000007ccd00007ecd000080cd000082cd000084cd000086cd000088cd00008acd00008ccd00008ecd000090cd000092cd0000facd000008ce00008cc401008ec4010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -462,7 +811,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000c8fc0000
+    m_ExpandedIDs: 000000007ccd00007ecd000080cd000082cd000084cd000086cd000088cd00008acd00008ccd00008ecd000090cd000092cd0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -489,7 +838,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -506,7 +855,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 16}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -517,8 +866,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 256
---- !u!114 &14
+  m_DirectoriesAreaWidth: 195
+--- !u!114 &25
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -538,10 +887,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1372
-    y: 146
-    width: 457
-    height: 991
+    x: 167
+    y: 105
+    width: 684
+    height: 1208
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -567,7 +916,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -594,29 +943,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 457
-      height: 970
-    m_Scale: {x: 0.59729064, y: 0.59729064}
-    m_Translation: {x: 228.5, y: 485}
+      width: 684
+      height: 1187
+    m_Scale: {x: 0.7309113, y: 0.7309113}
+    m_Translation: {x: 342, y: 593.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -382.56082
+      x: -467.90903
       y: -812
-      width: 765.12164
+      width: 935.81805
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.59729064
-  m_LastWindowPixelSize: {x: 457, y: 991}
+  m_defaultScale: 0.7309113
+  m_LastWindowPixelSize: {x: 684, y: 1208}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &15
+--- !u!114 &26
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -636,10 +985,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 151
-    y: 81
-    width: 576
-    height: 1269
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -654,8 +1003,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -174, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: -179, y: -1}
+      snapOffsetDelta: {x: 0, y: -25}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -875,7 +1224,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -1011,9 +1360,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -73.29077, y: -9436.352, z: -2.666277}
+    m_Target: {x: -378.86163, y: 508.23196, z: -14.362042}
     speed: 2
-    m_Value: {x: -73.29077, y: -9436.352, z: -2.666277}
+    m_Value: {x: -378.86163, y: 508.23196, z: -14.362042}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1063,9 +1412,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 269.5483
+    m_Target: 1442.5273
     speed: 2
-    m_Value: 269.5483
+    m_Value: 1442.5273
   m_Ortho:
     m_Target: 1
     speed: 2