修改bug

Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -162,7 +162,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.13268968}
   m_AnchorMax: {x: 0.5, y: 0.13268968}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 95}
   m_SizeDelta: {x: 750, y: 63.02014}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1026066119927368560
@@ -352,7 +352,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: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &855192496587546533
 CanvasGroup:
@@ -905,8 +905,8 @@ RectTransform:
   m_GameObject: {fileID: 1630334505711168803}
   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_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 6570571664023300045}
   - {fileID: 6103133270796787680}
@@ -914,7 +914,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -64.66766, y: 107.07454}
+  m_AnchoredPosition: {x: -41.2, y: 102.7}
   m_SizeDelta: {x: 329.6647, y: 65.2255}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2981485876630666593
@@ -1511,7 +1511,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -20.7502}
+  m_AnchoredPosition: {x: 0, y: -20.750244}
   m_SizeDelta: {x: 750, y: 118.0951}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3167469181355813890
@@ -2075,7 +2075,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4894137871019489262
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2092,8 +2092,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 1.2, y: 242}
-  m_SizeDelta: {x: 267.9468, y: 48.6719}
+  m_AnchoredPosition: {x: 0, y: 187}
+  m_SizeDelta: {x: 609.1066, y: 79.3023}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5751402451290122237
 CanvasRenderer:
@@ -2116,7 +2116,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8470589, g: 0.89019614, b: 0.89019614, a: 1}
+  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
@@ -3008,7 +3008,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 34
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 43

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 108, y: 96.45}
+  m_SizeDelta: {x: 0, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -2375,6 +2375,7 @@ GameObject:
   - component: {fileID: 7566769296908980725}
   - component: {fileID: 3905264220941356025}
   - component: {fileID: 5637155694417808183}
+  - component: {fileID: 9166494655224894342}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Mapname
@@ -2398,11 +2399,11 @@ RectTransform:
   - {fileID: 1926551284965162357}
   m_Father: {fileID: 3764721290890148754}
   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: 252.6, y: 106.1}
-  m_SizeDelta: {x: 151.6817, y: 36.6236}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -79.424, y: -5.3}
+  m_SizeDelta: {x: 0, y: 36.623596}
+  m_Pivot: {x: 1, y: 1}
 --- !u!222 &3905264220941356025
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2438,13 +2439,27 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E30\u90FD"
+--- !u!114 &9166494655224894342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &8848809442754795059
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -1496,7 +1496,7 @@ GameObject:
   - component: {fileID: 6332415411013533169}
   - component: {fileID: 7171448895155585201}
   - component: {fileID: 3683457587723248287}
-  - component: {fileID: 637341193158040451}
+  - component: {fileID: 4360891435948433655}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tenCion
@@ -1555,7 +1555,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 43
@@ -1566,7 +1566,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u514D\u8D39"
---- !u!114 &637341193158040451
+--- !u!114 &4360891435948433655
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1575,12 +1575,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 1604847036802696322}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 1
+  effectDistanceY: 1
+  samplingRate: 10
 --- !u!1 &1627423929816216099
 GameObject:
   m_ObjectHideFlags: 0
@@ -2762,7 +2763,7 @@ GameObject:
   - component: {fileID: 1802195678649483103}
   - component: {fileID: 4303440356813300985}
   - component: {fileID: 7005207063398492762}
-  - component: {fileID: 6747635218176705802}
+  - component: {fileID: 4692328669348406790}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: onCion
@@ -2821,7 +2822,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 43
@@ -2832,7 +2833,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u514D\u8D39"
---- !u!114 &6747635218176705802
+--- !u!114 &4692328669348406790
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2841,12 +2842,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 4899914660764355177}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 1
+  effectDistanceY: 1
+  samplingRate: 10
 --- !u!1 &5089696736954208135
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -37,8 +37,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 196.9, y: -43.4515}
-  m_SizeDelta: {x: 108, y: 96.45}
+  m_AnchoredPosition: {x: 115.51595, y: -23.732}
+  m_SizeDelta: {x: 57, y: 46.2139}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5356034030161481726
 CanvasRenderer:
@@ -69,8 +69,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
-    m_FontSize: 65
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 37
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
@@ -655,7 +655,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 101.24, y: 89.007}
+  m_SizeDelta: {x: 59.0219, y: 51.8902}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6889873714995245063
 CanvasRenderer:
@@ -1041,17 +1041,17 @@ RectTransform:
   m_GameObject: {fileID: 7520844935006336794}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 6377767369545045157}
   - {fileID: 3238679409698069968}
   m_Father: {fileID: 666260999598083492}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -2.9, y: 0.000091552734}
-  m_SizeDelta: {x: 284.56, y: 86.903}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 47.464}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &4896940394472558642
 MonoBehaviour:
@@ -1071,7 +1071,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 8
+  m_Spacing: -9.99
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1208,6 +1208,15 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: RedDotComType01
+    gameObject: {fileID: 6274519881336305377}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &2864693667708896535
 GameObject:
@@ -3320,6 +3329,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6934427383800001513}
+  - {fileID: 4404503928122068799}
   m_Father: {fileID: 1617875011636537765}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -5008,6 +5018,127 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
   m_PrefabInstance: {fileID: 1997473576992753959}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2049131876637579995
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4355802847687175809}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -15
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Name
+      value: RedDotComType01
+      objectReference: {fileID: 0}
+    - target: {fileID: 5439336813456305210, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: RedDotConfigId
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+--- !u!224 &4404503928122068799 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+  m_PrefabInstance: {fileID: 2049131876637579995}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &6274519881336305377 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5439336813456305210, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+  m_PrefabInstance: {fileID: 2049131876637579995}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8faa9321e9f040f42aa76599adb76143, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &6876462808036315284
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/daoju.spriteatlasv2

@@ -31,10 +31,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: d84b79a30f6baa04aad2377702a6fff8, type: 3}
     - {fileID: 2800000, guid: fc287bb1e8c1a9b42b766b953ccc4cc1, type: 3}
     - {fileID: 2800000, guid: c87f9af41546f5e488bae87199769f3d, type: 3}
+    - {fileID: 2800000, guid: 4be6e7eda5f7c49488213727a23cb3ac, type: 3}
     - {fileID: 2800000, guid: 3dbad1a5a76c126439669e6a3fd22f96, type: 3}
     - {fileID: 2800000, guid: 6d3ed58a661ac274c8e4563256a134ab, type: 3}
     - {fileID: 2800000, guid: 47489a5e6ac93b44caae37d1d2a81891, type: 3}
     - {fileID: 2800000, guid: f9235560a5af69942a289f4953d5dfe5, type: 3}
+    - {fileID: 2800000, guid: 5579b6e066a43ec4db944904f5f11176, type: 3}
     - {fileID: 2800000, guid: 5f64062b598715846ad43e6ce9b25868, type: 3}
     - {fileID: 2800000, guid: f70c1356c03bc044d993e8e82dd289d3, type: 3}
     - {fileID: 2800000, guid: 074ac8f3dc5c47642807ce2d8c4c5b98, type: 3}
@@ -56,6 +58,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 68aa6f00bec250343a09512d0708e782, type: 3}
     - {fileID: 2800000, guid: 93e16ce9520dc1f4da7449479a37d3b0, type: 3}
     - {fileID: 2800000, guid: bd52cd8b9975c264f975b0adb8c6255b, type: 3}
+    - {fileID: 2800000, guid: efc6cb2fd4e4efd4b9483d4afff6bc05, type: 3}
+    - {fileID: 2800000, guid: 09dc118ac2468fb4dba91b17668a65a5, type: 3}
+    - {fileID: 2800000, guid: 03690b8c18347df43b0185039b2aacc6, type: 3}
+    - {fileID: 2800000, guid: 46ce00e78da9d6244b4de33def54bba1, type: 3}
+    - {fileID: 2800000, guid: a2471ce0afd42414cab18de78436c5da, type: 3}
+    - {fileID: 2800000, guid: 93c879fdbe5139444af4a4b929b66b8a, type: 3}
     - {fileID: 2800000, guid: 30d1b75f214afd9468509004b1323cbc, type: 3}
     - {fileID: 2800000, guid: 54f2c3c9d402b9041aca03bba0508b19, type: 3}
     - {fileID: 2800000, guid: 88da5d7411d7b7c4db7008af4def7924, type: 3}

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -190,7 +190,7 @@ namespace GameLogic.Bag
                         f.id == item.config.associateVlaue[1]);
                 if (faaData != null)
                 {
-                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
+                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2] * item.count.Value);
                 }
                 else
                 {
@@ -212,7 +212,7 @@ namespace GameLogic.Bag
                         s.id == item.config.associateVlaue[1]);
                 if (skillData != null)
                 {
-                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
+                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]* item.count.Value);
                 }
                 else
                 {

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -80,19 +80,42 @@ namespace GameLogic.Player
                 else
                 {
                     //验证道具是否足够
-                    if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
-                            openBoxConfig.oneConsume))
+                    if (openBoxConfig.CostItemID == 1007)
                     {
-                        PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.oneConsume);
-                        allIitem = Summon(summonData, 1);
+#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+                        if (TakuSDKManager.Instance.IsReady())
+                        {
+                            bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                            if (!isOK)
+                            {
+                                return null;
+                            }
+                        }
+                        else
+                        {
+                            return null;
+                        }
 
-                        summonData.onePayCount++;
-                        //summonData.nextOneFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeFreePara[0] * 1000;
+#endif
                     }
                     else
                     {
-                        return null;
+                        //验证道具是否足够
+                        if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
+                                openBoxConfig.oneConsume) || openBoxConfig.CostItemID == 1007)
+                        {
+                            PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.oneConsume);
+                        }
+                        else
+                        {
+                            return null;
+                        }
                     }
+
+
+                    allIitem = Summon(summonData, 1);
+
+                    summonData.onePayCount++;
                 }
             }
             //十连抽
@@ -126,35 +149,56 @@ namespace GameLogic.Player
                 else
                 {
                     //验证道具是否足够
-                    if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
-                            openBoxConfig.tenConsume))
+                    if (openBoxConfig.CostItemID == 1007)
                     {
-                        PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.tenConsume);
-                        allIitem = Summon(summonData, 10);
-                        if (summonData.isSummonSocre)
+#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+                        if (TakuSDKManager.Instance.IsReady())
                         {
-                            //记录抽卡道具 用于成就检测
-                            List<int> drawHistory = new List<int>();
-                            foreach (var itemInfo in allIitem)
+                            bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                            if (!isOK)
                             {
-                                drawHistory.Add(itemInfo.itemID);
+                                return null;
                             }
-
-                            AccountFileInfo.IntList intList = new AccountFileInfo.IntList();
-                            intList.list = drawHistory;
-                            summonData.drawHistory.Add(intList);
-
-
-                            CheckAchievements(summonData);
+                        }
+                        else
+                        {
+                            return null;
                         }
 
-                        summonData.tenPayCount++;
-                        //summonData.nextTenFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeChargePara[0] * 1000;
+#endif
                     }
                     else
                     {
-                        return null;
+                        if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
+                                openBoxConfig.tenConsume) || openBoxConfig.CostItemID == 1007)
+                        {
+                            PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.tenConsume);
+                        }
+                        else
+                        {
+                            return null;
+                        }
+                    }
+
+                    allIitem = Summon(summonData, 10);
+                    if (summonData.isSummonSocre)
+                    {
+                        //记录抽卡道具 用于成就检测
+                        List<int> drawHistory = new List<int>();
+                        foreach (var itemInfo in allIitem)
+                        {
+                            drawHistory.Add(itemInfo.itemID);
+                        }
+
+                        AccountFileInfo.IntList intList = new AccountFileInfo.IntList();
+                        intList.list = drawHistory;
+                        summonData.drawHistory.Add(intList);
+
+
+                        CheckAchievements(summonData);
                     }
+
+                    summonData.tenPayCount++;
                 }
             }
 

Assets/Scripts/GameLogic/RedDot/RedDotManager.cs

@@ -248,6 +248,8 @@ public class RedDotManager : Singleton<RedDotManager>
 
     public bool isSkillUpgrade(SkillInfo _skillInfo)
     {
+        if (_skillInfo == null)
+            return false;
         var _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>();
         if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Length)
         {

Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
@@ -139,7 +140,16 @@ namespace Fort23.Mono
                     break;
             }
 
-            redDotComType01.CustomInit(2, skillConfigId);
+            if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillConfigId))
+            {
+                redDotComType01.CustomInit(2, skillConfigId);
+            }
+            else
+            {
+                redDotComType01.CustomInit(2, null);
+            }
+
+         
         }
 
         public override void DormancyObj()

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -86,6 +86,7 @@ namespace Fort23.Mono
             this.goCallBack = goCallBack;
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
+            Btn_RemoveEvent.gameObject.SetActive(randomEventConfig.EventTriggerType != 4);
 
             AccountFileInfo.EventLinkData eventLinkData =
                 eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -192,6 +192,7 @@ namespace Fort23.Mono
 
             _gongFaUpgradeInfoWidgets.Clear();
             _skillInfo = skillInfo;
+            RedDotComType01.CustomInit(2, _skillInfo);
             _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>().ToList();
             SkillConfig skillConfig = _skillInfo.skillConfig;
             Icon_GongFaIcon.icon_name = skillConfig.icon;

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs

@@ -3,8 +3,6 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
-using Coffee.UIExtensions;
-
 namespace Fort23.Mono
 {
 	public partial class GongFaUpgradePanel 
@@ -285,6 +283,17 @@ namespace Fort23.Mono
 	      return _fx_ui_gongfa_shengji;
 	     }
 	   }
+	  private RedDotWidgetType01 _RedDotComType01;
+	  public RedDotWidgetType01 RedDotComType01
+	   {
+	   get{
+	      if (_RedDotComType01 == null)
+	       {
+	         _RedDotComType01  = GetUIUnit<RedDotWidgetType01>("RedDotComType01"); 
+	       }
+	      return _RedDotComType01;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -73,7 +73,8 @@ namespace Fort23.Mono
 
                 foreach (var itemInfo in itemInfos)
                 {
-                    ItemInfo itemInfo1 = new ItemInfo(itemInfo.itemID, (long)(itemInfo.count.Value * (beLv - 1)));
+                    ItemInfo itemInfo1 = new ItemInfo(itemInfo.itemID,
+                        (long)(itemInfo.config.associateVlaue[1] * (beLv - 1)));
                     PlayerManager.Instance.BagController.AddItem(itemInfo1);
                 }
 

UserSettings/Layouts/default-2022.dwlt

@@ -14,65 +14,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -2494
-    y: 524
-    width: 1343
-    height: 1078
-  m_ShowMode: 0
-  m_Title: Console
-  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: -1080
-    y: 533
-    width: 829
-    height: 521
-  m_ShowMode: 0
-  m_Title: Animation
-  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: 76
-    y: 243
+    x: -1684
+    y: 31
     width: 596
-    height: 1232
+    height: 1226
   m_ShowMode: 0
   m_Title: Game
-  m_RootView: {fileID: 10}
+  m_RootView: {fileID: 4}
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   m_Maximized: 0
---- !u!114 &4
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -91,114 +43,12 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
-  m_RootView: {fileID: 11}
+  m_Title: Project
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &5
-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: 0
-    y: 0
-    width: 1343
-    height: 1078
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
-  m_Panes:
-  - {fileID: 19}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &6
-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: 5}
-  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: 34578
-  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: AnimationWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 829
-    height: 521
-  m_MinSize: {x: 100, y: 100}
-  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: 829
-    height: 521
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 33919
-  draggingID: 0
---- !u!114 &9
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -216,15 +66,15 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 596
-    height: 1232
-  m_MinSize: {x: 200, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 25}
+    height: 1226
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 25}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -237,19 +87,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
     width: 596
-    height: 1232
+    height: 1226
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
   controlID: 18
   draggingID: 0
---- !u!114 &11
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -262,9 +112,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -277,7 +127,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &12
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -299,7 +149,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &13
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -312,10 +162,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 18}
-  - {fileID: 15}
-  - {fileID: 16}
-  - {fileID: 17}
+  - {fileID: 12}
+  - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -325,9 +175,9 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 199
+  controlID: 163
   draggingID: 0
---- !u!114 &14
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -348,7 +198,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &15
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -363,18 +213,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1209
+    x: 1207
     y: 0
-    width: 426
+    width: 427
     height: 1299
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &16
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -389,18 +239,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1635
+    x: 1634
     y: 0
     width: 527
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 24}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &17
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -415,18 +265,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2162
+    x: 2161
     y: 0
-    width: 398
+    width: 399
     height: 1299
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 23}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &18
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -443,88 +293,17 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1209
+    width: 1207
     height: 1299
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 26}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 26}
-  - {fileID: 21}
+  - {fileID: 18}
+  - {fileID: 13}
   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: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -2494
-    y: 524
-    width: 1343
-    height: 1057
-  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
---- !u!114 &20
-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: 52968
---- !u!114 &21
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -611,7 +390,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &22
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -631,9 +410,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1209
+    x: 1207
     y: 73
-    width: 424
+    width: 425
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -647,26 +426,26 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_SceneHierarchy:
     m_TreeViewState:
-      scrollPos: {x: 0, y: 0}
+      scrollPos: {x: 0, y: 6679}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: ce85f1ffd685f1ff4487f1ff1c89f1ff2689f1ff3089f1ffe489f1fffc89f1ff268af1ff0ec9f1ff14c9f1ff14caf1ff58caf1ff5ccaf1ff6ecaf1ff74f1f6ff7cf1f6ffc0f2f6ffb026f7fff426f7fffc26f7ff0a27f7ffdec1f7ffe4c1f7ff76f0f7ff7ef0f7ff96f0f7ff38f1f7ff42f1f7ff4af1f7ff6af1f7ffdaf1f7ffde2af8ffec2af8ffca58f9ffd258f9ff1059f9ff8e59f9ff9859f9ffa059f9ff305af9ff585af9ff605af9ff3a92f9ff4092f9ff4093f9ff8493f9ff8893f9ff8c93f9ff9a93f9fff69efdfffc9efdff6ad3fdff02f0fdff0af0fdfff829fefffe29fefffe2afeff422bfeff462bfeff4a2bfeff582bfeffcaa3feffd8a3feff4eb6feff5cb6feff6828ffff6c28ffff7a28ffffa2b9ffff12baffff20baffff64f5ffff78fafffff4ffffffe8ce000016cf0000
+      m_ExpandedIDs: 2e2af6ff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: Group_Price
+        m_OriginalName: Group_Price
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: 94080
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 15}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -674,7 +453,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &23
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -694,9 +473,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2162
+    x: 2161
     y: 73
-    width: 397
+    width: 398
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -721,7 +500,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &24
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -741,7 +520,7 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1635
+    x: 1634
     y: 73
     width: 525
     height: 1278
@@ -756,7 +535,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gongfad
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -766,24 +545,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI/ItemDetailsPanel
+    - Assets/NuGet
     m_Globs: []
-    m_OriginalText: gongfad
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI/ItemDetailsPanel
+  - Assets/NuGet
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 358}
-    m_SelectedIDs: 74ce0000
-    m_LastClickedID: 52852
-    m_ExpandedIDs: 00000000c0cd0000c2cd0000c4cd0000c6cd0000c8cd0000cacd0000cccd0000cecd0000d0cd0000d2cd0000d4cd0000d6cd0000f8cd00003ece000076ce000054ae010000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 20ce0000
+    m_LastClickedID: 52768
+    m_ExpandedIDs: 00000000d4cd0000d6cd0000d8cd0000dacd0000dccd0000decd0000e0cd0000e2cd0000e4cd0000e6cd0000e8cd0000eacd000060ce000076ce000078ce000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -811,7 +590,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000c0cd0000c2cd0000c4cd0000c6cd0000c8cd0000cacd0000cccd0000cecd0000d0cd0000d2cd0000d4cd0000d6cd0000
+    m_ExpandedIDs: 00000000d4cd0000d6cd0000d8cd0000dacd0000dccd0000decd0000e0cd0000e2cd0000e4cd0000e6cd0000e8cd0000eacd0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -842,20 +621,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: 86c800008cc8000088c8000080b90000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: GongFaDetailsPanel
-      m_OriginalName: GongFaDetailsPanel
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 116006
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 16}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -866,8 +645,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 275
---- !u!114 &25
+  m_DirectoriesAreaWidth: 211
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -887,10 +666,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 76
-    y: 243
+    x: -1684
+    y: 31
     width: 596
-    height: 1211
+    height: 1205
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -907,7 +686,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1624}
+  m_TargetSize: {x: 1200, y: 2670}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -916,16 +695,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000016000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -375
-    m_HBaseRangeMax: 375
-    m_VBaseRangeMin: -812
-    m_VBaseRangeMax: 812
+    m_HBaseRangeMin: -600
+    m_HBaseRangeMax: 600
+    m_VBaseRangeMin: -1335
+    m_VBaseRangeMax: 1335
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -934,7 +713,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -944,28 +723,28 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 596
-      height: 1190
-    m_Scale: {x: 0.73275864, y: 0.73275864}
-    m_Translation: {x: 298, y: 595}
+      height: 1184
+    m_Scale: {x: 0.44344568, y: 0.44344568}
+    m_Translation: {x: 298, y: 592}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -406.68234
-      y: -812
-      width: 813.3647
-      height: 1624
+      x: -672.01013
+      y: -1335
+      width: 1344.0203
+      height: 2670
     m_MinimalGUI: 1
-  m_defaultScale: 0.73275864
-  m_LastWindowPixelSize: {x: 596, y: 1211}
+  m_defaultScale: 0.44344568
+  m_LastWindowPixelSize: {x: 596, y: 1205}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &26
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -987,7 +766,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1208
+    width: 1206
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1360,9 +1139,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.4246046, y: -1.8223176, z: 0.050965738}
+    m_Target: {x: -4.9022384, y: -3.4040327, z: -0.029634617}
     speed: 2
-    m_Value: {x: 584.17346, y: 1014.9901, z: -4.106431}
+    m_Value: {x: -4.9022384, y: -3.4040327, z: -0.029634617}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1412,9 +1191,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 2.958336
+    m_Target: 11.018387
     speed: 2
-    m_Value: 699.7546
+    m_Value: 11.018387
   m_Ortho:
     m_Target: 1
     speed: 2