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

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.93532306
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.87573236
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/UI/DivineSence/DivineSenceRestoredPanel.prefab

@@ -94,16 +94,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: DivineSenceRestoredWidget2
-    gameObject: {fileID: 2033147923900373901}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: DivineSenceRestoredWidget3
-    gameObject: {fileID: 363878515563725111}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_Tips1
     gameObject: {fileID: 5638955351412264767}
     isAssetBundle: 0
@@ -714,8 +704,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 3168022605306893254}
-  m_Horizontal: 0
-  m_Vertical: 1
+  m_Horizontal: 1
+  m_Vertical: 0
   m_MovementType: 1
   m_Elasticity: 0.1
   m_Inertia: 1
@@ -1187,8 +1177,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160942698795506826}
-  - {fileID: 4705749076700713595}
-  - {fileID: 6374243897004738753}
   m_Father: {fileID: 9019401354127365474}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -1426,19 +1414,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 76.91295
       objectReference: {fileID: 0}
     - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -49.37755
       objectReference: {fileID: 0}
     - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
       propertyPath: m_Pivot.x
@@ -1524,6 +1512,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: DivineSenceRestoredWidget1
       objectReference: {fileID: 0}
+    - target: {fileID: 7120197417844408888, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -1577,451 +1569,3 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
   m_PrefabInstance: {fileID: 4650861149860321092}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &7484072491092509455
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 3168022605306893254}
-    m_Modifications:
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 108
-      objectReference: {fileID: 0}
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 189.53296
-      objectReference: {fileID: 0}
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -49.37755
-      objectReference: {fileID: 0}
-    - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 174.7227
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 338.6773
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 463.60675
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -185.33865
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120197417844408888, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_Name
-      value: DivineSenceRestoredWidget3
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 7120197417844408888, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 8087089905231192071}
-  m_SourcePrefab: {fileID: 100100000, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
---- !u!1 &363878515563725111 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7120197417844408888, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 7484072491092509455}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &8087089905231192071
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 363878515563725111}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: Btn_Use
-    gameObject: {fileID: 2309277868753214180}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_Tip
-    gameObject: {fileID: 6628908356203200453}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_Count
-    gameObject: {fileID: 6135460939384475025}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Icon_Itemicon
-    gameObject: {fileID: 6183023506372345219}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
---- !u!114 &2309277868753214180 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5174908357842262507, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 7484072491092509455}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &6135460939384475025 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3673052118314143390, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 7484072491092509455}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &6183023506372345219 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3608024703213584012, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 7484072491092509455}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!224 &6374243897004738753 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 7484072491092509455}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &6628908356203200453 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4333123923111296202, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 7484072491092509455}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1001 &9144335363603601845
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 3168022605306893254}
-    m_Modifications:
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 108
-      objectReference: {fileID: 0}
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 189.53296
-      objectReference: {fileID: 0}
-    - target: {fileID: 1636522701298748635, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -49.37755
-      objectReference: {fileID: 0}
-    - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 174.7227
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 338.6773
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 277.98404
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -185.33865
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120197417844408888, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      propertyPath: m_Name
-      value: DivineSenceRestoredWidget2
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 7120197417844408888, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 9203169389683910433}
-  m_SourcePrefab: {fileID: 100100000, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
---- !u!1 &2033147923900373901 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7120197417844408888, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 9144335363603601845}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &9203169389683910433
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2033147923900373901}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: Btn_Use
-    gameObject: {fileID: 4122978576297476190}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_Tip
-    gameObject: {fileID: 4811372518955361663}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_Count
-    gameObject: {fileID: 5484955401835173675}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Icon_Itemicon
-    gameObject: {fileID: 5545465825605166905}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
---- !u!114 &4122978576297476190 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5174908357842262507, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 9144335363603601845}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!224 &4705749076700713595 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 9144335363603601845}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &4811372518955361663 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4333123923111296202, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 9144335363603601845}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &5484955401835173675 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3673052118314143390, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 9144335363603601845}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &5545465825605166905 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3608024703213584012, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
-  m_PrefabInstance: {fileID: 9144335363603601845}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

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

@@ -1,12 +1,16 @@
+using System.Collections.Generic;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "DivineSenceRestoredPanel")]
     public partial class DivineSenceRestoredPanel : UIPanel
     {
+        List<DivineSenceRestoredWidget> _divineSenceRestoredWidgets = new List<DivineSenceRestoredWidget>();
+
         private void Init()
         {
         }
@@ -35,60 +39,70 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
+            foreach (var divineSenceRestoredWidget in _divineSenceRestoredWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(divineSenceRestoredWidget);
+            }
+
+            _divineSenceRestoredWidgets.Clear();
+
             Text_DivineSencePoint.text =
                 $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}";
             DivineSenceRestoredWidget divineSenceRestoredWidget1 =
                 await UIManager.Instance.CreateGComponentForObject<DivineSenceRestoredWidget>(
-                    DivineSenceRestoredWidget1, null,
-                    Content);
+                    DivineSenceRestoredWidget1, null, Content, isInstance: true);
             divineSenceRestoredWidget1.CustomInit(601);
-            DivineSenceRestoredWidget divineSenceRestoredWidget2 =
-                await UIManager.Instance.CreateGComponentForObject<DivineSenceRestoredWidget>(
-                    DivineSenceRestoredWidget2, null,
-                    Content);
-            divineSenceRestoredWidget2.CustomInit(602);
-            DivineSenceRestoredWidget divineSenceRestoredWidget3 =
-                await UIManager.Instance.CreateGComponentForObject<DivineSenceRestoredWidget>(
-                    DivineSenceRestoredWidget3, null,
-                    Content);
-            divineSenceRestoredWidget3.CustomInit1(1703);
+            _divineSenceRestoredWidgets.Add(divineSenceRestoredWidget1);
+            ItemConfig[] itemConfigs = ConfigComponent.Instance.GetAll<ItemConfig>();
+            for (var i = 0; i < itemConfigs.Length; i++)
+            {
+                if (itemConfigs[i].itemTag == 8)
+                {
+                    DivineSenceRestoredWidget divineSenceRestoredWidget3 =
+                        await UIManager.Instance.CreateGComponentForObject<DivineSenceRestoredWidget>(
+                            DivineSenceRestoredWidget1, null,
+                            Content, isInstance: true);
+                    divineSenceRestoredWidget3.CustomInit1(itemConfigs[i].ID);
+                    _divineSenceRestoredWidgets.Add(divineSenceRestoredWidget3);
+                }
+            }
 
 
-            HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
+            UpdateText();
+
+            TimerComponent.Instance.AddTimer(1000, null, int.MaxValue, () => { UpdateText(); });
 
+            return await base.AsyncInit(uiData);
+        }
 
-            TimerComponent.Instance.AddTimer(1000, null, int.MaxValue, () =>
+        private void UpdateText()
+        {
+            HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
+            if (AccountFileInfo.Instance.playerData.divineSensePoint < heroPowerUpConfig.ShenshiMax)
             {
-                if (AccountFileInfo.Instance.playerData.divineSensePoint < heroPowerUpConfig.ShenshiMax)
+                if (AccountFileInfo.Instance.playerData.todayDivineSensePoint <
+                    PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[0])
                 {
-                    if (AccountFileInfo.Instance.playerData.todayDivineSensePoint <
-                        PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[0])
-                    {
-                        miao = 1 / PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[1];
-                    }
-                    else
-                    {
-                        miao = 1 / PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[1];
-                    }
-
-                    Text_Tips1.text =
-                        LanguageManager.Instance.Text(10332, PlayerManager.TimeToHSM((long)(miao)));
-                    int shengyuPoint =
-                        (int)(heroPowerUpConfig.ShenshiMax - AccountFileInfo.Instance.playerData.divineSensePoint);
-                    
-                    Text_Tips2.text =
-                        LanguageManager.Instance.Text(10333, PlayerManager.TimeToHSM((long)(shengyuPoint * miao )));
+                    miao = 1 / PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[1];
                 }
                 else
                 {
-                    Text_Tips1.text = LanguageManager.Instance.Text(10334);
-                    Text_Tips2.text = LanguageManager.Instance.Text(10334);
+                    miao = 1 / PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[1];
                 }
 
-              
-            });
+                Text_Tips1.text =
+                    LanguageManager.Instance.Text(10332, PlayerManager.TimeToHSM((long)(miao)));
+                int shengyuPoint =
+                    (int)(heroPowerUpConfig.ShenshiMax - AccountFileInfo.Instance.playerData.divineSensePoint);
 
-            return await base.AsyncInit(uiData);
+                Text_Tips2.text =
+                    LanguageManager.Instance.Text(10333, PlayerManager.TimeToHSM((long)(shengyuPoint * miao)));
+            }
+            else
+            {
+                Text_Tips1.text = LanguageManager.Instance.Text(10334);
+                Text_Tips2.text = LanguageManager.Instance.Text(10334);
+            }
         }
 
 
@@ -96,5 +110,16 @@ namespace Fort23.Mono
         {
             await UIManager.Instance.LoadAndOpenPanel<DivineSenceRestoredPanel>(null, UILayer.Top, isShowBG: true);
         }
+
+        public override CTask Close()
+        {
+            foreach (var divineSenceRestoredWidget in _divineSenceRestoredWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(divineSenceRestoredWidget);
+            }
+
+            _divineSenceRestoredWidgets.Clear();
+            return base.Close();
+        }
     }
 }

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

@@ -96,28 +96,6 @@ namespace Fort23.Mono
 	      return _DivineSenceRestoredWidget1;
 	     }
 	   }
-	  private GameObject _DivineSenceRestoredWidget2;
-	  public GameObject DivineSenceRestoredWidget2
-	   {
-	   get{
-	      if (_DivineSenceRestoredWidget2 == null)
-	       {
-	         _DivineSenceRestoredWidget2  = GetUIUnit<GameObject>("DivineSenceRestoredWidget2"); 
-	       }
-	      return _DivineSenceRestoredWidget2;
-	     }
-	   }
-	  private GameObject _DivineSenceRestoredWidget3;
-	  public GameObject DivineSenceRestoredWidget3
-	   {
-	   get{
-	      if (_DivineSenceRestoredWidget3 == null)
-	       {
-	         _DivineSenceRestoredWidget3  = GetUIUnit<GameObject>("DivineSenceRestoredWidget3"); 
-	       }
-	      return _DivineSenceRestoredWidget3;
-	     }
-	   }
 	  private Text _Text_Tips1;
 	  public Text Text_Tips1
 	   {