conflict commit

Assets/ManagedResources/Prefabs/Map/r_Map_NewEvent_004.prefab

@@ -109,7 +109,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &224776992750941490
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5142,7 +5142,7 @@ ParticleSystem:
 --- !u!199 &199212053728491298
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 2
+  m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -10239,7 +10239,7 @@ ParticleSystem:
 --- !u!199 &199230914713141734
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 2
+  m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

Assets/ManagedResources/~Lua/Common/GlobalDefine.lua

@@ -1783,6 +1783,7 @@ GENERAL_POPUP_TYPE={
     RecruitConfirm=19,----神将召唤、限时召唤、乾坤宝盒 二次确认界面
     TalismanResolve=20,--法宝回归
     XuanYuanBuyTimes=21,--轩辕宝镜购买次数确认
+    QinglongSerectTreasureBuyLevel = 22,--青龙秘宝购买等级
 }
 
 --抽卡类型