duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feature/review-npc' (#472) from feature/review-npc into develop

Browse Source 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/472
This commit is contained in:
hainh
2026-05-28 10:00:56 +00:00
parent 0d1ce5e957 d0dbf7f46e
commit dfda059258
5 changed files with 544 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
+8
View File
@@ -1309,6 +1309,14 @@ namespace BrewMonster.Scripts.Managers
}
}
var forward = button.GetComponent<ForwardDragToScrollRect>();
if (forward == null)
{
forward = button.gameObject.AddComponent<ForwardDragToScrollRect>();
}
forward.Target = button.GetComponentInParent<ScrollRect>();
// Setup drag-drop events
var eventTrigger = button.GetComponent<EventTrigger>();
if (eventTrigger == null)
Assets/PerfectWorld/Scripts/Managers/ForwardDragToScrollRect.cs
+47
View File
@@ -0,0 +1,47 @@
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
namespace BrewMonster.Scripts.Managers
{
/// <summary>
/// Forwards pointer drag events from the GameObject to the nearest parent ScrollRect.
/// Attach to UI elements (Buttons) that should allow ScrollRect dragging while still receiving clicks.
/// </summary>
public sealed class ForwardDragToScrollRect : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
{
private ScrollRect _target;
public ScrollRect Target
{
get
{
if (_target == null)
_target = GetComponentInParent<ScrollRect>();
return _target;
}
set => _target = value;
}
public void OnBeginDrag(PointerEventData eventData)
{
var t = Target;
if (t != null)
ExecuteEvents.Execute(t.gameObject, eventData, ExecuteEvents.beginDragHandler);
}
public void OnDrag(PointerEventData eventData)
{
var t = Target;
if (t != null)
ExecuteEvents.Execute(t.gameObject, eventData, ExecuteEvents.dragHandler);
}
public void OnEndDrag(PointerEventData eventData)
{
var t = Target;
if (t != null)
ExecuteEvents.Execute(t.gameObject, eventData, ExecuteEvents.endDragHandler);
}
}
}
Assets/PerfectWorld/Scripts/Managers/ForwardDragToScrollRect.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: c2b639a32c6511f498a0eb0b4986723e
Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
+14 -18
View File
@@ -3217,18 +3217,18 @@ namespace BrewMonster.UI
// id_dialog = (int)pService.id_dialog;
// idFunction = (int)SERVICE_TYPE.NPC_REPAIR;
// }
// else if (DataType == DATA_TYPE.DT_NPC_INSTALL_SERVICE)
// {
// NPC_INSTALL_SERVICE pService = (NPC_INSTALL_SERVICE)pData;
// id_dialog = (int)pService.id_dialog;
// idFunction = (int)SERVICE_TYPE.NPC_INSTALL;
// }
// else if (DataType == DATA_TYPE.DT_NPC_UNINSTALL_SERVICE)
// {
// NPC_UNINSTALL_SERVICE pService = (NPC_UNINSTALL_SERVICE)pData;
// id_dialog = (int)pService.id_dialog;
// idFunction = (int)SERVICE_TYPE.NPC_UNINSTALL;
// }
else if (DataType == DATA_TYPE.DT_NPC_INSTALL_SERVICE)
{
NPC_INSTALL_SERVICE pService = (NPC_INSTALL_SERVICE)pData;
id_dialog = (int)pService.id_dialog;
idFunction = (int)SERVICE_TYPE.NPC_INSTALL;
}
else if (DataType == DATA_TYPE.DT_NPC_UNINSTALL_SERVICE)
{
NPC_UNINSTALL_SERVICE pService = (NPC_UNINSTALL_SERVICE)pData;
id_dialog = (int)pService.id_dialog;
idFunction = (int)SERVICE_TYPE.NPC_UNINSTALL;
}
else if (DataType == DATA_TYPE.DT_NPC_SKILL_SERVICE)
{
NPC_SKILL_SERVICE pService = (NPC_SKILL_SERVICE)pData;
@@ -3438,19 +3438,15 @@ namespace BrewMonster.UI
if (pCurNPCEssence.HasValue)
{
dialogue1 = "Win_Enchase";
// var dlgInstall =GetGameUIMan().GetDialog("Win_Enchase");
// dlgInstall.Show(true);
// CECUIManager.Instance.ShowUI("Win_Enchase"); // old: handled locally (do NOT delete)
serviceNeedSetUpDialogue = SERVICE_TYPE.NPC_INSTALL;
}
//pShow1 = m_pAUIManager.GetDialog("Win_Enchase");
//pShow2 = m_pAUIManager.GetDialog("Win_Inventory");
}
else if (idFunction == (int)SERVICE_TYPE.NPC_UNINSTALL)
{
if (pCurNPCEssence.HasValue)
{
dialogue1 = "Win_Disenchase";
serviceNeedSetUpDialogue = SERVICE_TYPE.NPC_MAKE;
//CECUIManager.Instance.ShowUI("Win_Disenchase"); // old: handled locally (do NOT delete)
//var dlgInstall = GetGameUIMan().GetDialog("Win_Disenchase");
//dlgInstall.Show(true);
Assets/Prefabs/UI/InventoryUI.prefab
+470 -2
View File
@@ -357,6 +357,7 @@ GameObject:
- component: {fileID: 7770927426212845140}
- component: {fileID: 7226279953769421613}
- component: {fileID: 1151351884916287661}
- component: {fileID: 9087986133212397125}
m_Layer: 5
m_Name: item (23)
m_TagString: Untagged
@@ -467,6 +468,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &9087986133212397125
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 214142206554505557}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &406627371425863008
GameObject:
m_ObjectHideFlags: 0
@@ -1568,6 +1581,7 @@ GameObject:
- component: {fileID: 8304447743791816513}
- component: {fileID: 8705893860874192396}
- component: {fileID: 4325211679753705101}
- component: {fileID: 4581159036786983081}
m_Layer: 5
m_Name: item (31)
m_TagString: Untagged
@@ -1678,6 +1692,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4581159036786983081
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 753423593413820192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &821606379566615610
GameObject:
m_ObjectHideFlags: 0
@@ -1690,6 +1716,7 @@ GameObject:
- component: {fileID: 2857445571305670089}
- component: {fileID: 3615884774460245949}
- component: {fileID: 8085058780682726301}
- component: {fileID: 6817033458928882476}
m_Layer: 5
m_Name: item (8)
m_TagString: Untagged
@@ -1800,6 +1827,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &6817033458928882476
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 821606379566615610}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &824585185790796074
GameObject:
m_ObjectHideFlags: 0
@@ -1812,6 +1851,7 @@ GameObject:
- component: {fileID: 5598211718100199944}
- component: {fileID: 6935711794996745757}
- component: {fileID: 2738306976318300045}
- component: {fileID: 1603478138814755644}
m_Layer: 5
m_Name: item (13)
m_TagString: Untagged
@@ -1922,6 +1962,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1603478138814755644
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 824585185790796074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &891566428655745432
GameObject:
m_ObjectHideFlags: 0
@@ -2386,6 +2438,7 @@ GameObject:
- component: {fileID: 5881136512853759436}
- component: {fileID: 4094295733326713550}
- component: {fileID: 6378898610321673364}
- component: {fileID: 4794834617009148380}
m_Layer: 5
m_Name: item (3)
m_TagString: Untagged
@@ -2496,6 +2549,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4794834617009148380
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088063294378998627}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1113329446275992209
GameObject:
m_ObjectHideFlags: 0
@@ -2508,6 +2573,7 @@ GameObject:
- component: {fileID: 8429631206137715495}
- component: {fileID: 6951962433756442853}
- component: {fileID: 1118722550022985999}
- component: {fileID: 2579626499199260172}
m_Layer: 5
m_Name: item (21)
m_TagString: Untagged
@@ -2618,6 +2684,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2579626499199260172
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1113329446275992209}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1120701166803658542
GameObject:
m_ObjectHideFlags: 0
@@ -2965,6 +3043,7 @@ GameObject:
- component: {fileID: 5193332363625449635}
- component: {fileID: 1650320398114827075}
- component: {fileID: 6637188391666607837}
- component: {fileID: 5707865831316179312}
m_Layer: 5
m_Name: item (28)
m_TagString: Untagged
@@ -3075,6 +3154,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &5707865831316179312
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1234667034607844995}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1318629766155266332
GameObject:
m_ObjectHideFlags: 0
@@ -3797,6 +3888,7 @@ GameObject:
- component: {fileID: 4669016888142948704}
- component: {fileID: 5560756774637454501}
- component: {fileID: 1709723812041922369}
- component: {fileID: 7058964378393664531}
m_Layer: 5
m_Name: item (19)
m_TagString: Untagged
@@ -3907,6 +3999,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &7058964378393664531
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1750295303962435569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1816509434902435007
GameObject:
m_ObjectHideFlags: 0
@@ -4611,6 +4715,7 @@ GameObject:
- component: {fileID: 2288200095072551983}
- component: {fileID: 1686332263917135721}
- component: {fileID: 8779015981190170220}
- component: {fileID: 7996056380595991177}
m_Layer: 5
m_Name: item (14)
m_TagString: Untagged
@@ -4721,6 +4826,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &7996056380595991177
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2079353548137703858}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2099867340235850461
GameObject:
m_ObjectHideFlags: 0
@@ -5458,6 +5575,7 @@ GameObject:
- component: {fileID: 4424990606648586043}
- component: {fileID: 7958012561516752055}
- component: {fileID: 2274728463604437698}
- component: {fileID: 9016989267983943947}
m_Layer: 5
m_Name: item (32)
m_TagString: Untagged
@@ -5568,6 +5686,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &9016989267983943947
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2326637724701517296}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2380176964375632837
GameObject:
m_ObjectHideFlags: 0
@@ -6439,6 +6569,7 @@ GameObject:
- component: {fileID: 7898277816594249116}
- component: {fileID: 4260033252051213709}
- component: {fileID: 18163300172831917}
- component: {fileID: 1450427824126544616}
m_Layer: 5
m_Name: item (7)
m_TagString: Untagged
@@ -6549,6 +6680,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1450427824126544616
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2741252180928514397}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2750592509987921328
GameObject:
m_ObjectHideFlags: 0
@@ -6596,6 +6739,7 @@ GameObject:
- component: {fileID: 3365864951929921432}
- component: {fileID: 1062018175035355366}
- component: {fileID: 4822197976557957336}
- component: {fileID: 307358492900129838}
m_Layer: 5
m_Name: item (24)
m_TagString: Untagged
@@ -6706,6 +6850,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &307358492900129838
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2764657568475750449}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2788543853954346500
GameObject:
m_ObjectHideFlags: 0
@@ -7304,6 +7460,7 @@ GameObject:
- component: {fileID: 2856721154750738068}
- component: {fileID: 6438176685542076577}
- component: {fileID: 3000439317566971463}
- component: {fileID: 6355215817007327778}
m_Layer: 5
m_Name: item (30)
m_TagString: Untagged
@@ -7414,6 +7571,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &6355215817007327778
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3090741152473556388}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &3151132583511974738
GameObject:
m_ObjectHideFlags: 0
@@ -7969,6 +8138,7 @@ GameObject:
- component: {fileID: 2187128381409090692}
- component: {fileID: 4243736617324327410}
- component: {fileID: 6095578658933393940}
- component: {fileID: 2237656079946469190}
m_Layer: 5
m_Name: item (18)
m_TagString: Untagged
@@ -8079,6 +8249,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2237656079946469190
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3383490081939010073}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &3447548746154245601
GameObject:
m_ObjectHideFlags: 0
@@ -10014,6 +10196,7 @@ GameObject:
- component: {fileID: 1089767424569938356}
- component: {fileID: 303047265709351170}
- component: {fileID: 2063316416182270024}
- component: {fileID: 3377332825324972375}
m_Layer: 5
m_Name: item (27)
m_TagString: Untagged
@@ -10124,6 +10307,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &3377332825324972375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4681958919279138041}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4804214973178185926
GameObject:
m_ObjectHideFlags: 0
@@ -10617,6 +10812,7 @@ GameObject:
- component: {fileID: 3191299483015327354}
- component: {fileID: 4586329326449109733}
- component: {fileID: 8642631602760797404}
- component: {fileID: 8360449995727328422}
m_Layer: 5
m_Name: item (10)
m_TagString: Untagged
@@ -10727,6 +10923,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &8360449995727328422
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4932514100521066045}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4985314278362084858
GameObject:
m_ObjectHideFlags: 0
@@ -10739,6 +10947,7 @@ GameObject:
- component: {fileID: 646141365757993319}
- component: {fileID: 7912943525942768702}
- component: {fileID: 7149893595675355278}
- component: {fileID: 3954148453696515179}
m_Layer: 5
m_Name: item (33)
m_TagString: Untagged
@@ -10849,6 +11058,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &3954148453696515179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4985314278362084858}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &5000783979861768536
GameObject:
m_ObjectHideFlags: 0
@@ -11532,6 +11753,7 @@ GameObject:
- component: {fileID: 4691748982627565434}
- component: {fileID: 8268982278917658952}
- component: {fileID: 9104942314522626901}
- component: {fileID: 4215948082689532338}
m_Layer: 5
m_Name: item (25)
m_TagString: Untagged
@@ -11642,6 +11864,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4215948082689532338
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5492842310561605224}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &5528256791455449162
GameObject:
m_ObjectHideFlags: 0
@@ -13286,6 +13520,7 @@ GameObject:
- component: {fileID: 5432865309610152938}
- component: {fileID: 7170940130437660970}
- component: {fileID: 5476494023671112805}
- component: {fileID: 6534431902348725963}
m_Layer: 5
m_Name: item (15)
m_TagString: Untagged
@@ -13396,6 +13631,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &6534431902348725963
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6102690194021457630}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6170696405360611913
GameObject:
m_ObjectHideFlags: 0
@@ -13408,6 +13655,7 @@ GameObject:
- component: {fileID: 1854000480269282361}
- component: {fileID: 8956541588907819823}
- component: {fileID: 4825386250963705913}
- component: {fileID: 2195712928796841195}
m_Layer: 5
m_Name: item (9)
m_TagString: Untagged
@@ -13518,6 +13766,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2195712928796841195
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6170696405360611913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6171466074678281354
GameObject:
m_ObjectHideFlags: 0
@@ -14189,6 +14449,7 @@ GameObject:
- component: {fileID: 60662140527981697}
- component: {fileID: 1533753494937707198}
- component: {fileID: 8631960679953241981}
- component: {fileID: 354327443372530921}
m_Layer: 5
m_Name: item
m_TagString: Untagged
@@ -14299,6 +14560,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &354327443372530921
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6277085571977903451}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6377806151830969588
GameObject:
m_ObjectHideFlags: 0
@@ -15054,6 +15327,7 @@ GameObject:
- component: {fileID: 5507746274446318125}
- component: {fileID: 1158282585144881002}
- component: {fileID: 7087549554151292240}
- component: {fileID: 525834307949209946}
m_Layer: 5
m_Name: item (1)
m_TagString: Untagged
@@ -15164,6 +15438,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &525834307949209946
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6799385661542259087}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6857291352949638306
GameObject:
m_ObjectHideFlags: 0
@@ -15251,6 +15537,7 @@ GameObject:
- component: {fileID: 1804255185103233552}
- component: {fileID: 5655260316423101156}
- component: {fileID: 5261405257905849254}
- component: {fileID: 4478622380959571345}
m_Layer: 5
m_Name: item (29)
m_TagString: Untagged
@@ -15361,6 +15648,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4478622380959571345
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6873613940388935223}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6901784665839400237
GameObject:
m_ObjectHideFlags: 0
@@ -15373,6 +15672,7 @@ GameObject:
- component: {fileID: 6729696452031645912}
- component: {fileID: 2127952002450102140}
- component: {fileID: 2123458309420386859}
- component: {fileID: 7383472208747561139}
m_Layer: 5
m_Name: item (11)
m_TagString: Untagged
@@ -15483,6 +15783,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &7383472208747561139
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6901784665839400237}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7036745814604181074
GameObject:
m_ObjectHideFlags: 0
@@ -15982,6 +16294,7 @@ GameObject:
- component: {fileID: 6368106788922464168}
- component: {fileID: 87349016916040992}
- component: {fileID: 865117487066452666}
- component: {fileID: 421607326899611352}
m_Layer: 5
m_Name: item (12)
m_TagString: Untagged
@@ -16092,6 +16405,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &421607326899611352
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7286840725325698178}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7387654070587452060
GameObject:
m_ObjectHideFlags: 0
@@ -17221,6 +17546,7 @@ GameObject:
- component: {fileID: 2037996333270751210}
- component: {fileID: 8788511402268505655}
- component: {fileID: 6047951561857673206}
- component: {fileID: 4807655054894352097}
m_Layer: 5
m_Name: item (6)
m_TagString: Untagged
@@ -17331,6 +17657,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4807655054894352097
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7730936328049335931}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7766973892328327799
GameObject:
m_ObjectHideFlags: 0
@@ -17407,6 +17745,7 @@ GameObject:
- component: {fileID: 3936309839807773759}
- component: {fileID: 9198122499215909044}
- component: {fileID: 6124868624528414004}
- component: {fileID: 5809077166178074537}
m_Layer: 5
m_Name: item (17)
m_TagString: Untagged
@@ -17517,6 +17856,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &5809077166178074537
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7813825455001692784}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7896090427726985299
GameObject:
m_ObjectHideFlags: 0
@@ -17751,6 +18102,7 @@ GameObject:
- component: {fileID: 8582985124559326547}
- component: {fileID: 1374694686075457063}
- component: {fileID: 446419893204499847}
- component: {fileID: 3408590995846452536}
m_Layer: 5
m_Name: item (26)
m_TagString: Untagged
@@ -17861,6 +18213,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &3408590995846452536
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7922958039934358531}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8018933504929521550
GameObject:
m_ObjectHideFlags: 0
@@ -17948,6 +18312,7 @@ GameObject:
- component: {fileID: 8638902288217072353}
- component: {fileID: 7753445416171654742}
- component: {fileID: 2529899190892004480}
- component: {fileID: 7931860330730313477}
m_Layer: 5
m_Name: item (4)
m_TagString: Untagged
@@ -18058,6 +18423,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &7931860330730313477
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8063036289747584484}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8089922328694440213
GameObject:
m_ObjectHideFlags: 0
@@ -18265,6 +18642,7 @@ GameObject:
- component: {fileID: 2456012859654119860}
- component: {fileID: 1557452352874688987}
- component: {fileID: 5314207367656224755}
- component: {fileID: 3356075686819463747}
m_Layer: 5
m_Name: item (35)
m_TagString: Untagged
@@ -18375,6 +18753,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &3356075686819463747
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8094087016474699342}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8159793291707617532
GameObject:
m_ObjectHideFlags: 0
@@ -18455,6 +18845,7 @@ GameObject:
- component: {fileID: 2564877671418510795}
- component: {fileID: 7667159999314385075}
- component: {fileID: 4790456768164964333}
- component: {fileID: 8704293234776288151}
m_Layer: 5
m_Name: item (34)
m_TagString: Untagged
@@ -18565,6 +18956,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &8704293234776288151
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183427786109081281}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8275718873605923461
GameObject:
m_ObjectHideFlags: 0
@@ -18577,6 +18980,7 @@ GameObject:
- component: {fileID: 711716836773666754}
- component: {fileID: 4604292894064639339}
- component: {fileID: 1534361631884466594}
- component: {fileID: 3545532797948879828}
m_Layer: 5
m_Name: item (20)
m_TagString: Untagged
@@ -18687,6 +19091,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &3545532797948879828
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8275718873605923461}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8388271149263772430
GameObject:
m_ObjectHideFlags: 0
@@ -18699,6 +19115,7 @@ GameObject:
- component: {fileID: 4858735269476752564}
- component: {fileID: 629873971483735874}
- component: {fileID: 2144208882157918958}
- component: {fileID: 8019296129527552781}
m_Layer: 5
m_Name: item (16)
m_TagString: Untagged
@@ -18809,6 +19226,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &8019296129527552781
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8388271149263772430}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8391554359103785703
GameObject:
m_ObjectHideFlags: 0
@@ -19112,6 +19541,7 @@ GameObject:
- component: {fileID: 7076150385748090933}
- component: {fileID: 1434665029634527886}
- component: {fileID: 4147018034906166882}
- component: {fileID: 4236024477770517029}
m_Layer: 5
m_Name: item (5)
m_TagString: Untagged
@@ -19222,6 +19652,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4236024477770517029
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8654772407644160490}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8705454116501790813
GameObject:
m_ObjectHideFlags: 0
@@ -19234,6 +19676,7 @@ GameObject:
- component: {fileID: 1603482610352845741}
- component: {fileID: 3645648363356210124}
- component: {fileID: 7651647860721819200}
- component: {fileID: 2506786879772295468}
m_Layer: 5
m_Name: item (22)
m_TagString: Untagged
@@ -19344,6 +19787,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2506786879772295468
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8705454116501790813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8787503064864052193
GameObject:
m_ObjectHideFlags: 0
@@ -19894,6 +20349,7 @@ GameObject:
- component: {fileID: 727932028507791180}
- component: {fileID: 3429582349692515553}
- component: {fileID: 3029955162080532056}
- component: {fileID: 3614554413604858798}
m_Layer: 5
m_Name: item (2)
m_TagString: Untagged
@@ -20004,6 +20460,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &3614554413604858798
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9149250215976481164}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2b639a32c6511f498a0eb0b4986723e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9182772680628993978
GameObject:
m_ObjectHideFlags: 0
@@ -20627,7 +21095,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -42
value: -836.15
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
@@ -20647,7 +21115,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -21
value: -418.075
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []