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.6672832
+    - _Alpha: 0.99681973
     - _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.07833733
+    - _Alpha: 0.99363846
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/Config/SmallPlacesConfig.json

@@ -34,7 +34,7 @@
       "ID": 4,
       "placeName": 10040,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10040",
       "PlacesId": 1,
       "CompletionEventCount": 8,
       "UnlockEnvetid": 0,
@@ -44,7 +44,7 @@
       "ID": 5,
       "placeName": 10041,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10041",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -54,7 +54,7 @@
       "ID": 6,
       "placeName": 10042,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10042",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -64,7 +64,7 @@
       "ID": 7,
       "placeName": 10043,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10043",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -74,7 +74,7 @@
       "ID": 8,
       "placeName": 10044,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10044",
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -84,7 +84,7 @@
       "ID": 9,
       "placeName": 10045,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10045",
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -94,7 +94,7 @@
       "ID": 10,
       "placeName": 10046,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10046",
       "PlacesId": 3,
       "CompletionEventCount": -1,
       "UnlockEnvetid": 0,

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -2246,7 +2246,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.000061035156}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3925115245566125737
@@ -3035,7 +3035,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3202,10 +3202,10 @@ RectTransform:
   - {fileID: 3975152748973005260}
   m_Father: {fileID: 3275273584098972649}
   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: 184, y: -495.5}
-  m_SizeDelta: {x: 379.7488, y: 61.396}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -191, y: 316.5}
+  m_SizeDelta: {x: 379.74878, y: 61.395996}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2253655063094105127
 CanvasRenderer:
@@ -3291,11 +3291,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3275273584098972649}
   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_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7774198419232979247
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -513,6 +513,95 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10223
+--- !u!1 &2982119556634525415
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7635835174510739831}
+  - component: {fileID: 4149286377509563690}
+  - component: {fileID: 3174834520961549602}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7635835174510739831
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2982119556634525415}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4149286377509563690
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2982119556634525415}
+  m_CullTransparentMesh: 1
+--- !u!114 &3174834520961549602
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2982119556634525415}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6f525d051e27c33e0699a302ce6a4b3d
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3427245093439295002
 GameObject:
   m_ObjectHideFlags: 0
@@ -748,7 +837,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0022888184, y: 0}
+  m_AnchoredPosition: {x: 0.002319336, y: 0}
   m_SizeDelta: {x: 2205.539, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8994874510214016950
@@ -781,6 +870,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7635835174510739831}
   - {fileID: 4438962577033244578}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -6387,13 +6387,25 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 431064081871231763, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 431064081871231763, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 431064081871231763, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 195
+      objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
@@ -6401,7 +6413,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
@@ -6411,6 +6423,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 1624
       objectReference: {fileID: 0}
+    - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 195
+      objectReference: {fileID: 0}
     - target: {fileID: 1168641042236661909, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_LocalScale.x
       value: 1
@@ -6465,7 +6481,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
@@ -6473,7 +6489,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
@@ -6483,6 +6499,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 2850
       objectReference: {fileID: 0}
+    - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 170
+      objectReference: {fileID: 0}
     - target: {fileID: 2733326372389011073, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_IsActive
       value: 0
@@ -6585,7 +6605,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
@@ -6593,7 +6613,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
@@ -6603,6 +6623,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 2850
       objectReference: {fileID: 0}
+    - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 178
+      objectReference: {fileID: 0}
     - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -187,9 +187,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -812}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4642743923766498100
@@ -263,11 +263,10 @@ RectTransform:
   - {fileID: 5545518394005214355}
   - {fileID: 650471420867651992}
   - {fileID: 930165116866783181}
-  - {fileID: 6352458157530052881}
   - {fileID: 4739378095024639026}
+  - {fileID: 6352458157530052881}
   - {fileID: 9037408276187403176}
   - {fileID: 4230966754887618893}
-  - {fileID: 438881006348347736}
   - {fileID: 2738520516351410424}
   - {fileID: 6795257728327854590}
   - {fileID: 1014077760537991407}
@@ -403,7 +402,7 @@ GameObject:
   - component: {fileID: 5663735608059393018}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (3)
+  m_Name: tt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -423,11 +422,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8599819629026832582}
   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.0012817, y: -386}
-  m_SizeDelta: {x: 750, y: 1238}
-  m_Pivot: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -177.38635}
+  m_SizeDelta: {x: 0, y: -354.7727}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1467102737304571141
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -739,7 +738,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 438881006348347736}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
@@ -1261,11 +1261,11 @@ RectTransform:
   m_Children:
   - {fileID: 4389887259738624222}
   - {fileID: 3717419306532235287}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 6352458157530052881}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.0012741, y: 465.6}
+  m_AnchoredPosition: {x: 0, y: 0.4975891}
   m_SizeDelta: {x: 750, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2409805748406759842
@@ -2607,7 +2607,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.0012817, y: 41.2}
+  m_AnchoredPosition: {x: -0.0012817, y: 41.19995}
   m_SizeDelta: {x: 750, y: 349}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8097696157492160637

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -183,19 +183,18 @@ namespace Fort23.Mono
             }
             else
             {
-               EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
-               if (eventNpc.isNpc)
-               {
-                   DialgueType1.GetComponent<CustomStateController>().ChangeState(1);
-                   PLayerNameRoot.SetActive(true);
-            
-                   Text_Name2.text = LanguageManager.Instance.Text(eventNpc.name);
-               }
-               else
-               {
-                   PLayerNameRoot.SetActive(false);
-               }
-           
+                EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
+                if (eventNpc.isNpc)
+                {
+                    DialgueType1.GetComponent<CustomStateController>().ChangeState(1);
+                    PLayerNameRoot.SetActive(true);
+
+                    Text_Name2.text = LanguageManager.Instance.Text(eventNpc.name);
+                }
+                else
+                {
+                    PLayerNameRoot.SetActive(false);
+                }
             }
 
 
@@ -233,7 +232,7 @@ namespace Fort23.Mono
         {
             if (isOver)
                 return;
-            icon.gameObject.SetActive(false);
+
             icon.onSpriteAlter = () =>
             {
                 icon.SetNativeSize();
@@ -241,14 +240,16 @@ namespace Fort23.Mono
             };
             if (eventConditionConfig.NPCID != 100 && eventConditionConfig.NPCID != 0)
             {
+                icon.gameObject.SetActive(false);
                 EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
 
-           
+
                 icon.icon_name = eventNpc.icon;
             }
             else
             {
-                icon.icon_name = "bg_lh_di1";
+                icon.gameObject.SetActive(true);
+                // icon.icon_name = "bg_lh_di1";
             }
 
             if (eventConditionConfig.EventID == 10000)