lzx 1 ماه پیش
والد
کامیت
52e2f0114b

+ 10 - 0
Assets/Res/Config/SmallPlacesConfig.json

@@ -4,6 +4,7 @@
       "ID": 1,
       "placeName": 10037,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 1,
       "CompletionEventCount": 5,
       "UnlockEnvetid": 10001,
@@ -13,6 +14,7 @@
       "ID": 2,
       "placeName": 10038,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_haibian",
       "PlacesId": 1,
       "CompletionEventCount": 4,
       "UnlockEnvetid": 10004,
@@ -22,6 +24,7 @@
       "ID": 3,
       "placeName": 10039,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_mijing",
       "PlacesId": 1,
       "CompletionEventCount": 6,
       "UnlockEnvetid": 10009,
@@ -31,6 +34,7 @@
       "ID": 4,
       "placeName": 10040,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 1,
       "CompletionEventCount": 8,
       "UnlockEnvetid": 10012,
@@ -40,6 +44,7 @@
       "ID": 5,
       "placeName": 10041,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10013,
@@ -49,6 +54,7 @@
       "ID": 6,
       "placeName": 10042,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10018,
@@ -58,6 +64,7 @@
       "ID": 7,
       "placeName": 10043,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10022,
@@ -67,6 +74,7 @@
       "ID": 8,
       "placeName": 10044,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10025,
@@ -76,6 +84,7 @@
       "ID": 9,
       "placeName": 10045,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10028,
@@ -85,6 +94,7 @@
       "ID": 10,
       "placeName": 10046,
       "placeDesc": 0,
+      "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 3,
       "CompletionEventCount": -1,
       "UnlockEnvetid": -1,

+ 9 - 9
Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -318,8 +318,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -301.25613, y: -177.38}
-  m_SizeDelta: {x: 274.732, y: 67.577}
+  m_AnchoredPosition: {x: -288.3, y: -155.5}
+  m_SizeDelta: {x: 305, y: 106}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &3548920735970161296
 CanvasRenderer:
@@ -349,7 +349,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 9350cdb3a6456eb41a3f968633a9ba0c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -359,14 +359,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_wancheng_di
+  _icon_name: bg_sm_map_zidi
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: fb7db534836aa844b84854aa2c6da552, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: map
-    packgJsonPath: /Art/UIAssets/TextrueJson\map.txt
-    packgSpritePath: Assets/Res/UIAtlas/map.spriteatlasv2
-    lasetJsonGUID: 45345416f43d95b0fc20b08e42875768
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a8c60c0bafc6a50970ede1f51833bf09
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

+ 10 - 0
Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs

@@ -44,6 +44,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///小地点图标
+		/// </summary>
+#if !COMBAT_SERVER
+		public string placeIcon;
+#else
+		public string placeIcon{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///属于哪个大地点
 		/// </summary>

+ 5 - 1
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredPanel.cs

@@ -14,6 +14,8 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = true;
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()
@@ -111,7 +113,9 @@ namespace Fort23.Mono
 
         public async static CTask<DivineSenceRestoredPanel> OpenPanel()
         {
-            DivineSenceRestoredPanel divineSenceRestoredPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceRestoredPanel>(null, UILayer.Top, isShowBG: true);
+            DivineSenceRestoredPanel divineSenceRestoredPanel =
+                await UIManager.Instance.LoadAndOpenPanel<DivineSenceRestoredPanel>(null, UILayer.Middle,
+                    isShowBG: true);
             return divineSenceRestoredPanel;
         }
 

+ 2 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoWidget.cs

@@ -122,6 +122,8 @@ namespace Fort23.Mono
             Btn_Qianwang.gameObject.SetActive(PlayerManager.Instance.CurrentsmallPlaces.id != smallPlacesConfig.ID);
             Icon_DIdian.gameObject.SetActive(PlayerManager.Instance.CurrentsmallPlaces.id != smallPlacesConfig.ID);
 
+            Icon_Places.icon_name = smallPlacesConfig.placeIcon;
+
             bool isUlock = IsSmallPlacesDataUlock(smallPlacesConfig.ID);
 
 

BIN
Excel2Json/Excel/Maps.xlsx