Jelajahi Sumber

Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

LT 1 Minggu lalu
induk
melakukan
833712c659
31 mengubah file dengan 1141 tambahan dan 555 penghapusan
  1. 2 2
      Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat
  2. 7 0
      Assets/Res/Config/DropConfig.json
  3. 7 0
      Assets/Res/Config/DropGroupConfig.json
  4. 10 0
      Assets/Res/Config/DropItemConfig.json
  5. 45 14
      Assets/Res/Config/EventConfig.json
  6. 83 8
      Assets/Res/Config/EventLinkConfig.json
  7. 116 116
      Assets/Res/Config/HeroPowerUpConfig.json
  8. 27 2
      Assets/Res/Config/ItemConfig.json
  9. 57 57
      Assets/Res/Config/LanguageChineseConfig.json
  10. 112 112
      Assets/Res/Config/MonsterPowerUpConfig.json
  11. 6 0
      Assets/Res/Config/PlayerGuideConfig.json
  12. 1 1
      Assets/Res/UI/DialoguePanel/DialoguePanel.prefab
  13. 4 4
      Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab
  14. 1 1
      Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab
  15. 1 0
      Assets/Scripts/GameLogic/Player/SummonManager.cs
  16. 12 1
      Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs
  17. 23 18
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs
  18. 25 4
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs
  19. 1 1
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase8.cs
  20. 0 0
      Assets/StreamingAssets/assetConfig.txt
  21. TEMPAT SAMPAH
      Excel2Json/Excel/ChouKa.xlsx
  22. TEMPAT SAMPAH
      Excel2Json/Excel/EventConfig.xlsx
  23. TEMPAT SAMPAH
      Excel2Json/Excel/HeroPowerUp.xlsx
  24. TEMPAT SAMPAH
      Excel2Json/Excel/InitialPlayer.xlsx
  25. TEMPAT SAMPAH
      Excel2Json/Excel/Item.xlsx
  26. TEMPAT SAMPAH
      Excel2Json/Excel/Language.xlsx
  27. TEMPAT SAMPAH
      Excel2Json/Excel/MonsterPowerUp.xlsx
  28. TEMPAT SAMPAH
      Excel2Json/Excel/PlayerGuide.xlsx
  29. TEMPAT SAMPAH
      Excel2Json/Excel/skill.xlsx
  30. TEMPAT SAMPAH
      Excel2Json/Excel/修仙游戏数据规划表.xlsx
  31. 601 214
      UserSettings/Layouts/default-2022.dwlt

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.21030664
+    - _Alpha: 0.21220803
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.1997621
+    - _MainTexOffsetU: 0.19749725
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

+ 7 - 0
Assets/Res/Config/DropConfig.json

@@ -2033,6 +2033,13 @@
         48
       ],
       "dropType": 2
+    },
+    {
+      "ID": 999011,
+      "dropGroupID": [
+        49
+      ],
+      "dropType": 2
     }
   ]
 }

+ 7 - 0
Assets/Res/Config/DropGroupConfig.json

@@ -335,6 +335,13 @@
       "dropItemID": [
         18
       ]
+    },
+    {
+      "ID": 49,
+      "dropRate": 1000,
+      "dropItemID": [
+        25
+      ]
     }
   ]
 }

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

@@ -313,6 +313,16 @@
       "dropMinV": 1000,
       "dropMaxV": 1000,
       "dropCountGoupID": -1
+    },
+    {
+      "ID": 25,
+      "dropItemType": 1,
+      "itemID": [
+        12506
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
     }
   ]
 }

+ 45 - 14
Assets/Res/Config/EventConfig.json

@@ -2838,7 +2838,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -2859,7 +2859,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -2887,8 +2887,14 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 100,
-      "RefreshCount": 1,
+      "PrizeIDs": [
+        20003
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 50,
+      "RefreshCount": 3,
       "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -4811,10 +4817,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        10000,
         3000
       ],
       "RefreshProbability": 40,
@@ -6236,6 +6244,14 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
+      "PrizeIDs": [
+        1401,
+        1003
+      ],
+      "PrizeNums": [
+        1,
+        -3000
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
@@ -6265,18 +6281,24 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
+      "PrizeIDs": [
+        1401,
+        1003
+      ],
+      "PrizeNums": [
+        1,
+        -3000
+      ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
       "XiantuID": 0,
       "EventConditionId": [
-        10,
-        3
+        10
       ],
       "EventValue": [
-        9147,
-        20
+        9147
       ],
       "EventName": 4283,
       "Description": 4363
@@ -6297,18 +6319,24 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
+      "PrizeIDs": [
+        1401,
+        1003
+      ],
+      "PrizeNums": [
+        1,
+        -3000
+      ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
       "XiantuID": 0,
       "EventConditionId": [
-        10,
-        3
+        10
       ],
       "EventValue": [
-        9148,
-        40
+        9148
       ],
       "EventName": 4284,
       "Description": 4364
@@ -6496,10 +6524,13 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
-        10
+        1
       ],
       "EventValue": [
-        9153
+        23200
+      ],
+      "EventCount": [
+        3
       ],
       "EventName": 4289,
       "Description": 4369

+ 83 - 8
Assets/Res/Config/EventLinkConfig.json

@@ -21329,11 +21329,20 @@
       ],
       "DialogueType": 0,
       "EventID": 9150,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        915004
-      ]
+      "optionType": 4,
+      "optionPara1": [
+        1401
+      ],
+      "optionPara2": [
+        1
+      ],
+      "PrizeIDs": [
+        1402
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 0
     },
     {
       "ID": 915004,
@@ -21348,6 +21357,12 @@
       "DialogueType": 0,
       "EventID": 9150,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        -1000
+      ],
       "ResultType": 0
     },
     {
@@ -21474,7 +21489,19 @@
       ],
       "DialogueType": 0,
       "EventID": 9151,
-      "optionType": 0,
+      "optionType": 4,
+      "optionPara1": [
+        1001
+      ],
+      "optionPara2": [
+        100
+      ],
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
       "ResultType": 0
     },
     {
@@ -21508,6 +21535,12 @@
       "DialogueType": 0,
       "EventID": 9151,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        100
+      ],
       "ResultType": 0
     },
     {
@@ -21587,6 +21620,12 @@
       "DialogueType": 0,
       "EventID": 9152,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        100
+      ],
       "ResultType": 0
     },
     {
@@ -21652,7 +21691,19 @@
       ],
       "DialogueType": 0,
       "EventID": 9152,
-      "optionType": 0,
+      "optionType": 4,
+      "optionPara1": [
+        1001
+      ],
+      "optionPara2": [
+        100
+      ],
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
       "ResultType": 0
     },
     {
@@ -21731,7 +21782,19 @@
       ],
       "DialogueType": 0,
       "EventID": 9153,
-      "optionType": 0,
+      "optionType": 4,
+      "optionPara1": [
+        1001
+      ],
+      "optionPara2": [
+        100
+      ],
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
       "ResultType": 0
     },
     {
@@ -21834,6 +21897,12 @@
       "DialogueType": 0,
       "EventID": 9153,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        100
+      ],
       "ResultType": 0
     },
     {
@@ -21921,6 +21990,12 @@
       "DialogueType": 0,
       "EventID": 9154,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        999999
+      ],
       "ResultType": 1,
       "ResultOptions": [
         915406

File diff ditekan karena terlalu besar
+ 116 - 116
Assets/Res/Config/HeroPowerUpConfig.json


+ 27 - 2
Assets/Res/Config/ItemConfig.json

@@ -5935,7 +5935,7 @@
       "itemName": 10100,
       "itemDesc": 10104,
       "icon": "icon_adcard1",
-      "itemTag": 24,
+      "itemTag": 25,
       "quality": 4,
       "stack": 0,
       "isSell": false,
@@ -5967,7 +5967,7 @@
       "itemName": 10101,
       "itemDesc": 10105,
       "icon": "icon_adcard2",
-      "itemTag": 24,
+      "itemTag": 25,
       "quality": 5,
       "stack": 0,
       "isSell": false,
@@ -5993,6 +5993,31 @@
       ],
       "sort": 0,
       "itemDesc2": 0
+    },
+    {
+      "ID": 23200,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_adcard1",
+      "itemTag": 26,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
     }
   ]
 }

+ 57 - 57
Assets/Res/Config/LanguageChineseConfig.json

@@ -898,95 +898,95 @@
     },
     {
       "ID": 225,
-      "txt": "练气"
+      "txt": "练气"
     },
     {
       "ID": 226,
-      "txt": "筑基"
+      "txt": "筑基"
     },
     {
       "ID": 227,
-      "txt": "结丹"
+      "txt": "结丹"
     },
     {
       "ID": 228,
-      "txt": "元婴"
+      "txt": "元婴"
     },
     {
       "ID": 229,
-      "txt": "化神"
+      "txt": "化神"
     },
     {
       "ID": 230,
-      "txt": "炼虚"
+      "txt": "炼虚"
     },
     {
       "ID": 231,
-      "txt": "大乘"
+      "txt": "大乘"
     },
     {
       "ID": 232,
-      "txt": "飞升"
+      "txt": "飞升"
     },
     {
       "ID": 233,
-      "txt": "逍遥"
+      "txt": "逍遥"
     },
     {
       "ID": 234,
-      "txt": "真神"
+      "txt": "真神"
     },
     {
       "ID": 235,
-      "txt": "前"
+      "txt": "前期."
     },
     {
       "ID": 236,
-      "txt": "中"
+      "txt": "中期."
     },
     {
       "ID": 237,
-      "txt": "后"
+      "txt": "后期."
     },
     {
       "ID": 238,
-      "txt": "1"
+      "txt": "一重"
     },
     {
       "ID": 239,
-      "txt": "2"
+      "txt": "二重"
     },
     {
       "ID": 240,
-      "txt": "3"
+      "txt": "三重"
     },
     {
       "ID": 241,
-      "txt": "4"
+      "txt": "四重"
     },
     {
       "ID": 242,
-      "txt": "5"
+      "txt": "五重"
     },
     {
       "ID": 243,
-      "txt": "6"
+      "txt": "六重"
     },
     {
       "ID": 244,
-      "txt": "7"
+      "txt": "七重"
     },
     {
       "ID": 245,
-      "txt": "8"
+      "txt": "八重"
     },
     {
       "ID": 246,
-      "txt": "9"
+      "txt": "九重"
     },
     {
       "ID": 247,
-      "txt": "10"
+      "txt": "十重"
     },
     {
       "ID": 248,
@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4077,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4078,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4079,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4080,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4081,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4084,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4085,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4086,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4087,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4088,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4089,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4090,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4093,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4094,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4095,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4096,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4097,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4098,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4099,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4102,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4131,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4193,
@@ -38562,7 +38562,7 @@
     },
     {
       "ID": 10381,
-      "txt": "圆满"
+      "txt": "圆满"
     },
     {
       "ID": 10382,
@@ -38710,7 +38710,7 @@
     },
     {
       "ID": 10418,
-      "txt": " 听说这里可以免费获得代金券?这些是可以白嫖吗?"
+      "txt": "听说这里可以免费获得代金券?这些是可以白嫖吗?"
     },
     {
       "ID": 10419,
@@ -38718,7 +38718,7 @@
     },
     {
       "ID": 10420,
-      "txt": " 代金券可以兑换稀有资源,我们先去兑换一些妖丹。"
+      "txt": "代金券可以兑换稀有资源,我们先去兑换一些妖丹。"
     },
     {
       "ID": 10421,

File diff ditekan karena terlalu besar
+ 112 - 112
Assets/Res/Config/MonsterPowerUpConfig.json


+ 6 - 0
Assets/Res/Config/PlayerGuideConfig.json

@@ -1211,6 +1211,12 @@
       "SpeakerImage": 3,
       "desc": 10424,
       "Highlighting": 1,
+      "AwardItem": [
+        1002
+      ],
+      "AwardItemNum": [
+        2700
+      ],
       "blackAlpha": 0.0,
       "Handle": 1,
       "IsSkip": 0,

+ 1 - 1
Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -3521,7 +3521,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

+ 4 - 4
Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -1822,7 +1822,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 55.200012, y: -168.2185}
-  m_SizeDelta: {x: 69.6064, y: 27.7519}
+  m_SizeDelta: {x: 98, y: 36}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3243743412898019261
 CanvasRenderer:
@@ -1845,7 +1845,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.25882354, g: 0.6313726, b: 0.654902, a: 1}
+  m_Color: {r: 0.3647059, g: 0.7058824, b: 0.7254902, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1862,7 +1862,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing
+  _icon_name: dec_yuanjiao8
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -6756,7 +6756,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: -2, y: -29.2}
+  m_AnchoredPosition: {x: 0, y: -38.1}
   m_SizeDelta: {x: 12.963, y: 12.963}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7772942714632693403

+ 1 - 1
Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -131,7 +131,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: -4.6391296, y: -99.1}
+  m_AnchoredPosition: {x: -4.6391296, y: -109.1}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4846741517815700259

+ 1 - 0
Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Bag;
 using UnityEngine;

+ 12 - 1
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -35,6 +35,7 @@ namespace Fort23.Mono
                     return null;
                 }
 
+
                 return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
         }
@@ -60,6 +61,15 @@ namespace Fort23.Mono
                     return null;
                 }
 
+                if (PlayerGuideManager.Instance.curPhase == 8 && openBoxConfig.ID == 2)
+                {
+                    PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID, openBoxConfig.oneConsume);
+
+                    var item = DropManager.Instance.DropItem(999011);
+                    PlayerManager.Instance.BagController.AddItem(item);
+                    return item;
+                }
+
                 return await PlayerManager.Instance.SummonManager.Summon(configId, 1);
             }
         }
@@ -87,11 +97,12 @@ namespace Fort23.Mono
         {
             // AppBarPanel.ClosePanel();
             TitlePanel.OpenPanel(new List<int>() { openBoxConfig.CostItemID });
-            
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(8, 1))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             return base.GetFocus();
         }
 

+ 23 - 18
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -17,6 +17,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "DialoguePanel")]
     public partial class DialoguePanel : UIPanel
     {
+        private bool isShowAnima;
         private int[] dialogueMessaga;
         private ShowDialogueEventData.MessageShowType messageShowType;
         private Action<int?> finish;
@@ -51,14 +52,14 @@ namespace Fort23.Mono
         {
             DialoguePanel dialoguePanel = await UIManager.Instance.LoadAndOpenPanel<DialoguePanel>(null, UILayer.Top,
                 uiData: new object[] { CurrentEventList, id, icon, messageShowType, finish, isShowAnima });
-            if (isShowAnima)
-            {
-                dialoguePanel.DialgueType1Anim.Play("DialgueType1open");
-            }
-            else
-            {
-                dialoguePanel.DialgueType1Anim.Play("DialgueType1idle1");
-            }
+            // if (isShowAnima)
+            // {
+            //     dialoguePanel.DialgueType1Anim.Play("DialgueType1open");
+            // }
+            // else
+            // {
+            //     dialoguePanel.DialgueType1Anim.Play("DialgueType1idle1");
+            // }
 
             // dialoguePanel.ShowPanel(CurrentEventList, id, icon, messageShowType, finish);
         }
@@ -72,10 +73,20 @@ namespace Fort23.Mono
             dialoguePanel.ShowPanel(LanID, icon, messageShowType, finish);
         }
 
-        public override CTask Show()
+        public async override CTask Show()
         {
             EventManager.Instance.Dispatch(CustomEventType.DialoguePanelOpen, null);
-            return base.Show();
+
+
+            base.Show();
+            if (isShowAnima)
+            {
+                DialgueType1Anim.Play("DialgueType1open");
+            }
+            else
+            {
+                DialgueType1Anim.Play("DialgueType1idle1");
+            }
         }
 
         public async override CTask<bool> AsyncInit(object[] uiData)
@@ -149,14 +160,8 @@ namespace Fort23.Mono
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish, bool isShowAnima)
         {
-            if (isShowAnima)
-            {
-                DialgueType1Anim.Play("DialgueType1open");
-            }
-            else
-            {
-                DialgueType1Anim.Play("DialgueType1idle1");
-            }
+            this.isShowAnima = isShowAnima;
+
 
             this.CurrentEventList = CurrentEventList;
             eventConditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(id);

+ 25 - 4
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs

@@ -179,8 +179,20 @@ namespace Fort23.Mono.Phases
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
 
-            GameObject gameObject =
-                UIManager.Instance.GetComponent<SkillSelectPanel>()._skillWidgets[1].own;
+            SkillSelectPanel skillSelectPanel =
+                UIManager.Instance.GetComponent<SkillSelectPanel>();
+            GameObject gameObject = null;
+            foreach (var skillWidget in skillSelectPanel._skillWidgets)
+            {
+                if (skillWidget.skillConfigId.skillConfig.IDGroup == 1405)
+                {
+                    gameObject = skillWidget.own;
+                    break;
+                }
+            }
+
+            // GameObject gameObject =
+            //     UIManager.Instance.GetComponent<SkillSelectPanel>()._skillWidgets[1].own;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 
@@ -240,9 +252,18 @@ namespace Fort23.Mono.Phases
         {
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
+            SkillSelectPanel skillSelectPanel =
+                UIManager.Instance.GetComponent<SkillSelectPanel>();
+            GameObject gameObject = null;
+            foreach (var skillWidget in skillSelectPanel._skillWidgets)
+            {
+                if (skillWidget.skillConfigId.skillConfig.IDGroup == 2006)
+                {
+                    gameObject = skillWidget.own;
+                    break;
+                }
+            }
 
-            GameObject gameObject =
-                UIManager.Instance.GetComponent<SkillSelectPanel>()._skillWidgets[2].own;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 

+ 1 - 1
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase8.cs

@@ -97,7 +97,7 @@ namespace Fort23.Mono.Phases
         {
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
-            GameObject gameObject = UIManager.Instance.GetComponent<BoxPanel>().tenButton.gameObject;
+            GameObject gameObject = UIManager.Instance.GetComponent<BoxPanel>().oneButton.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 

File diff ditekan karena terlalu besar
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


TEMPAT SAMPAH
Excel2Json/Excel/ChouKa.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/EventConfig.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/HeroPowerUp.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/InitialPlayer.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/Item.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/Language.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/MonsterPowerUp.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/PlayerGuide.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/skill.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/修仙游戏数据规划表.xlsx


File diff ditekan karena terlalu besar
+ 601 - 214
UserSettings/Layouts/default-2022.dwlt


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini