From 9331a51652c67ab215d22d531f94454e36b566f0 Mon Sep 17 00:00:00 2001 From: tangbin <11111111> Date: Wed, 30 Jul 2025 15:22:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameAssets/Maps/1/XML/MapConfig.xml | 6 ++++-- Assets/GameAssets/Maps/1/XML/MapRegions.xml | 2 +- Assets/GameAssets/Maps/1/XML/NpcsConfig.xml | 8 ++++---- Assets/GameAssets/Maps/1/XML/Obs.bytes | Bin 60020 -> 51380 bytes Assets/Scenes/SampleScene.unity | 3 +-- Assets/Scripts/Map/MapManager.cs | 9 ++++++--- Assets/Scripts/Map/SceneArea.cs | 4 ++++ Assets/Scripts/UI/UICellInfo.cs | 4 ++-- Assets/Scripts/UI/UIMapPanel.cs | 16 ++++++---------- Assets/Scripts/UI/UITeleportPanel.cs | 2 +- Assets/Scripts/Utils/UIMouseOver.cs | 2 +- 11 files changed, 30 insertions(+), 26 deletions(-) diff --git a/Assets/GameAssets/Maps/1/XML/MapConfig.xml b/Assets/GameAssets/Maps/1/XML/MapConfig.xml index 383a380..eec2889 100644 --- a/Assets/GameAssets/Maps/1/XML/MapConfig.xml +++ b/Assets/GameAssets/Maps/1/XML/MapConfig.xml @@ -1,7 +1,9 @@  - - + + + + diff --git a/Assets/GameAssets/Maps/1/XML/MapRegions.xml b/Assets/GameAssets/Maps/1/XML/MapRegions.xml index 20cdc51..f6caa35 100644 --- a/Assets/GameAssets/Maps/1/XML/MapRegions.xml +++ b/Assets/GameAssets/Maps/1/XML/MapRegions.xml @@ -1,6 +1,6 @@  - + diff --git a/Assets/GameAssets/Maps/1/XML/NpcsConfig.xml b/Assets/GameAssets/Maps/1/XML/NpcsConfig.xml index 764c6ca..2d21681 100644 --- a/Assets/GameAssets/Maps/1/XML/NpcsConfig.xml +++ b/Assets/GameAssets/Maps/1/XML/NpcsConfig.xml @@ -5,19 +5,19 @@ - + - + - + - + diff --git a/Assets/GameAssets/Maps/1/XML/Obs.bytes b/Assets/GameAssets/Maps/1/XML/Obs.bytes index 1f869b055c29d7b1c3738f547521b123381d5170..c91e9e7fbe4bed9e141ac7ebcdececcc86769f27 100644 GIT binary patch literal 51380 zcmeHKTasNj2pp%%d+{Q&qii6{&+yTeE{w!ONax;beN2I%X&N{)PJVoSef{(O^Y8c1 z-`_vKzJLC@KX(WB8@S)V{RZwgaKC~34Seu7@bh~%`HB2DPX-&|yO`hiKH4$jKLYmx z7WVG>_dT!f1iOU=AKqf+R{97M)UaH5H=H1^sBYf-z7IAGcyN;iDi#GJPbV>|Az`eU&*(=Y!!c(cm9bhdE*7pg% zHDe~mJIK^^VdYj97wh^Ie>AH#zmDl0==|u-btBA5ocTY=uinbqfwy0)Mq;RAAF-?* z_4tH%C$J1jpD>=PK-i}bDR zN7q&LS9)h_JZ-oWtcQO(pPgUhJ^hT=Sk76#;H`KjrhDRz`@jmP_{hJi&CJeNZyv^q zZ{aH#UE{rVU%}%>u;BRAdtnEd)3d-=t;avhqbFnZoj3>lt6A2V@i9lF2G~^_>D7f< z)!JRZG8eRX9Kdy0uUBXO>A#2Fv&cL%&Ud>HX2IXbC+`Iv4ttP#_?@<@i|b_XqKRWsAGMt`jkq%3UsONiMt!^E+%xOrcciil)OOEf@m2I? zcOiJIcXzC!OKPz1$}Xg)dyWxbMPGF%BMqJLinf(ob!zvxDzjB< zzbmGDpM39{X~c_v$47Z9KHG}#ewlf&;5+ep1PdxWD4<7qjO@0umTQ~5r;9Yp$eU_2cs@*Q*R;>gUu zO9S(=9{i2q*iN5yypq2%^UgWsKB5hGf?d%Yt=&0Sl{>0Ef{SVpE{(NfxQ%5ada4-i zr*%I4uFjzX;j z)4i8SPY(l4nVmg>_2%f#@7PO+#wT{4>De)3g(IUef~{!KHIY6iFsw`Z@%w3ib^dPs zt9n-Jc^+_a>}emGvUZp5tPT&)I-^*PV~(eNtu6B2soCqVd(ZHUo#7U7-W*^!TG(Kx(!Xj*tep?&C(IDD}h$8W}ok9lz`&86|tH}}+>I_JI7 z)55WC&Z9=G#QD9$=iU(?8fI9H(YHc=#m@Sl%*hPWZ)KKDZTD=_o4-Z&GrC6DZoMmf zGTTV!j`&C`dX4g<(Y&AySnmhWoxSozhwRhq4 zydz$Xv)+6s@ik_|?Zq{Z^%f2*ej?`S@5pEN8J!vT()g-g&11c#=To<;&XujRZY8_0 zc&r^+F^kjU^I{hFD2DID>OHFIhtX3!jp=@xZ>E`RBl;O1@r6_C8NDNX5e(*-%?-?mZ=|srkM!owjuc}*fMc?RGoi*C016S3E zI%tqL{HhfW>`rWzCsT)hn5SwpJ*(KNHq=%7aviu}Pu)p0;8tSMzhZfwU4B-V=-`?T zUCbx`$yis&@UYf?A~B1X>#V$v zF@EIlzLjVi_3nu4nOEPQrVKxG&FUEE`CWhiq|Zo`r(q>O>bVlvda7K^V{veP)yMCh z$Af!YdN}6sRP)^9)qI{wYvbH$Uu&`6yEIw7UL~ey#_s^Wamgd5vAf=p-R$ZO-iU_N z7-)mVUHDeWby=Bl#^vo`R@<5LbnMP|&Qj%CxmC4iq;B`_EBq1Ns~G6Ac&y)9;Aht2 z>Ws~LKbh;C(c;2vRt|q>IS0IFxu)CqdOwlxp3&lyxvaRv^zT)62bx#c>wM&`IbPxI z>1K@{c9z%o5G=SkhuAJV)3~c=7q6v##BE`tG2BDAQG-6nNgT1AR`);Ew__$~k7x!K zef3-7h_RJ>%xaLk_WwO~??Ucjaq^u;7_08a?0w$7+`Zgy;C=)58@S)V{RZwgaKC~3 Z4cu?wegpR#xZlA22JSa-zk#)H;6M09S1bSk literal 60020 zcmeI5OLEje5Cv@_xCck!Fr10=G8My%elE95Ev(WoRxT#`t7<7?EPRjpAMMq=_IVrcQeM}X_RdDUws>ftw|lOMEIg06Hfn9vV7+Fv zl83X8{Th=;&9=)u@mGC~mB&h^y7p?V7#;cC;;))MCX4zVaaQ8@*;X~9oz+q%v$dD+{cQk^Q-o)u6aH3czhm_n`bi1k?+;VIc>3<@!XnI&DlO>5$$aK>T|)R z;`gt7qNZQ#IjHaJ^zXbpkB(f#Ss8e%HQM2>@(3nX9@W|^PtPLytJhs=pXX6M_YrwS zeKM&%R32Nrx7MpH^O|Rp*RDQ(L>|FhnOvQJetz<(zaN=b_gHysopa>(D$e5ln0pXh zwz7zI@>t`v!m`@4nnzV*&zf?L_UyCw+~=eAp3Q_j>h~=2I5QLSSj!_go$-#6N6lI9 z2YJ+-&Tuu(Admke2jxv3*Ulq*pfT;;i?iR4;I1>HC5N{R&SvB1k;mIC&UQ6tK^}D; z-F(R7J^%c@&W!Th+;cm7A-`&qTlWOU|PXYo7woEf7|Z}WLaKhLw*%Y1y?^=xOH z(RJ_Lb)C(u-*vvu>Z<>&b;YG>yPhr1?5h2&b*mh@d3D!+#!RX_I-W=W{t>mwue9oWK=lAf;*X_C1&%Z){#%k|e=A^$7F+Z!7_cI>fiW#qeoeQqYBLAK6n(!a| zGYjW*L|=JSwemeM9{E(-Fy#>M?Mv| zt~K}%{+UG=^QvyX2gW0xid)wj{0INcqKkP|H{S!}kx#{~YYqN`e`e9eysDe;f$_+v o;?}hW|G_`A=we>g&G*1~ int.Parse(mapPic.text); @@ -55,7 +55,10 @@ public partial class MapManager : MonoBehaviour private int _cellCols; //public CellNode[,] cellNodes; - public int _curOpenMapId; + public int _curOpenMapId { + get; + set; + } private Material _cellMoveMat; private Material _cellObsMat; diff --git a/Assets/Scripts/Map/SceneArea.cs b/Assets/Scripts/Map/SceneArea.cs index ef7fa5a..e94cbda 100644 --- a/Assets/Scripts/Map/SceneArea.cs +++ b/Assets/Scripts/Map/SceneArea.cs @@ -73,6 +73,10 @@ public class SceneArea : MonoBehaviour if (obj == null) return null; GameObject cellObj = GameObject.Instantiate(obj,parentTrans); var area = cellObj.GetComponent(); + if (area == null) + { + Debug.LogError($" {obj.name} ..."); + } area.editCellType = baseItem.editCellType; area.baseItem = baseItem; baseItem.sceneArea = area; diff --git a/Assets/Scripts/UI/UICellInfo.cs b/Assets/Scripts/UI/UICellInfo.cs index 87eab65..f030817 100644 --- a/Assets/Scripts/UI/UICellInfo.cs +++ b/Assets/Scripts/UI/UICellInfo.cs @@ -79,7 +79,7 @@ public class UICellInfo : MonoBehaviour /// public void LoadCell() { - MapManager.Instance.LoadMapObs(UIWindow.Instance.uiMapPanel.CurOpenMapId); + MapManager.Instance.LoadMapObs(MapManager.Instance._curOpenMapId); ShowMapCellInfo(); } /// @@ -91,7 +91,7 @@ public class UICellInfo : MonoBehaviour int height = int.Parse(txtCellCols.text); float cellW = int.Parse(txtCellWidth.text) / 100.0f; float cellH = int.Parse(txtCellHeight.text) / 100.0f; - MapManager.Instance.GenerateMap(UIWindow.Instance.uiMapPanel.CurOpenMapId,width * cellW, height * cellH, cellW, cellH); + MapManager.Instance.GenerateMap(MapManager.Instance._curOpenMapId,width * cellW, height * cellH, cellW, cellH); ShowMapCellInfo(); } public void Update() diff --git a/Assets/Scripts/UI/UIMapPanel.cs b/Assets/Scripts/UI/UIMapPanel.cs index 0f4909b..7d4528d 100644 --- a/Assets/Scripts/UI/UIMapPanel.cs +++ b/Assets/Scripts/UI/UIMapPanel.cs @@ -14,14 +14,11 @@ public class UIMapPanel : MonoBehaviour { public ToggleGroup mapEditorGroup; public Dropdown dropMap; - private int _curOpenMapId; private bool _saving; - public int CurOpenMapId => _curOpenMapId; // Start is called before the first frame update void Start() { _saving = false; - _curOpenMapId = -1; } void OnDataLoaded() @@ -112,26 +109,25 @@ public class UIMapPanel : MonoBehaviour return; } - if(_curOpenMapId > 0) + if(MapManager.Instance._curOpenMapId > 0) { UIWindow.Instance.ShowMessage("ȹرеͼ"); return; } int mapId = Convert.ToInt32(dropMap.options[dropMap.value].text); - _curOpenMapId = mapId; + MapManager.Instance._curOpenMapId = mapId; + MapManager.Instance.LoadMapRegionSprites(mapId); + MapManager.Instance.LoadMapObs(mapId); UIWindow.Instance.uiEditMapConfig.LoadMapConfig(mapId); - MapManager.Instance.LoadMapRegionSprites(_curOpenMapId); - MapManager.Instance.LoadMapObs(_curOpenMapId); UIWindow.Instance.uiMonstersPanel.LoadMonsterConfig(mapId); UIWindow.Instance.uiNpcsPanel.LoadNpcsConfig(mapId); UIWindow.Instance.uiTriggersPanel.LoadTriggersConfig(mapId); UIWindow.Instance.uiFuBensPanel.LoadFuBenConfig(mapId); UIWindow.Instance.uiJuBaosPanel.LoadJuBaoConfig(mapId); - //ûãҪ if (MapManager.Instance.map == null) { - MapManager.Instance.CreateObs(_curOpenMapId); + MapManager.Instance.CreateObs(mapId); } UICellInfo.Instance.ShowMapCellInfo(); } @@ -139,7 +135,7 @@ public class UIMapPanel : MonoBehaviour public void CloseMap() { MapManager.Instance.CloseMap(); - _curOpenMapId = -1; + MapManager.Instance._curOpenMapId = -1; foreach (var toggle in mapEditorGroup.ActiveToggles()) { toggle.isOn = false; diff --git a/Assets/Scripts/UI/UITeleportPanel.cs b/Assets/Scripts/UI/UITeleportPanel.cs index 986ddad..3a282c0 100644 --- a/Assets/Scripts/UI/UITeleportPanel.cs +++ b/Assets/Scripts/UI/UITeleportPanel.cs @@ -54,7 +54,7 @@ public class UITeleportPanel : MonoBehaviour item.txtPos.text = $"{pos.x},{pos.y}"; item.txtNextMapID.text = nextMapId.ToString(); item.txtNextMapPos.text = $"{newMapPos.x},{newMapPos.y}"; - item.editCellType = MapManager.EditCellType.TriggerCell; + item.editCellType = MapManager.EditCellType.TeleportCell; MapManager.Instance.CreateSpecialPoint(pos, item); } diff --git a/Assets/Scripts/Utils/UIMouseOver.cs b/Assets/Scripts/Utils/UIMouseOver.cs index d2bfc41..6a3d1f5 100644 --- a/Assets/Scripts/Utils/UIMouseOver.cs +++ b/Assets/Scripts/Utils/UIMouseOver.cs @@ -25,7 +25,7 @@ public class UIMouseOver : MonoBehaviour, IPointerClickHandler, IPointerEnterHan public void OnPointerEnter(PointerEventData eventData) { - if(UIWindow.Instance.uiMapPanel.CurOpenMapId < 0) + if(MapManager.Instance._curOpenMapId < 0) { UIWindow.Instance.ShowMessage("先打开地图"); return;