ybx_Gdn 1 سال پیش
والد
کامیت
7487308437
3فایلهای تغییر یافته به همراه357 افزوده شده و 21 حذف شده
  1. 96 12
      Assets/Lua/Config/FashionPaperCfg.lua
  2. 260 8
      Assets/Lua/Config/ItemCfg2.lua
  3. 1 1
      Assets/Lua/Managers/LuaBattleMgr.lua

+ 96 - 12
Assets/Lua/Config/FashionPaperCfg.lua

@@ -1248,30 +1248,114 @@ local FashionPaperCfg = {
 --================================================新增==================================
 [30000]={
 ['PaperId']=30000,
-['PaperName']='占卜师(女)圖紙',
-['MakeMaterial']={{420,30},{422,30},{440,30},{1,1000}},
-['FashionId']=40023,
+['PaperName']='占卜师头饰(女)圖紙',
+['MakeMaterial']={{420,90},{422,90},{440,90},{1,70000}},
+['FashionId']=10097,
 ['ResolveItem']={{497,1}},
 },
 [30001]={
 ['PaperId']=30001,
-['PaperName']='占卜师(男)圖紙',
-['MakeMaterial']={{420,30},{422,30},{440,30},{1,1000}},
-['FashionId']=40024,
+['PaperName']='占卜师头饰(男)圖紙',
+['MakeMaterial']={{420,90},{422,90},{440,90},{1,70000}},
+['FashionId']=10098,
 ['ResolveItem']={{497,1}},
 },
 [30002]={
 ['PaperId']=30002,
-['PaperName']='占卜师头饰(女)圖紙',
-['MakeMaterial']={{420,30},{422,30},{440,30},{1,1000}},
-['FashionId']=10097,
+['PaperName']='占星师帽子(女)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=10099,
 ['ResolveItem']={{497,1}},
 },
 [30003]={
 ['PaperId']=30003,
-['PaperName']='占卜师头饰(男)圖紙',
-['MakeMaterial']={{420,30},{422,30},{440,30},{1,1000}},
-['FashionId']=10098,
+['PaperName']='占星师帽子(男)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=10100,
+['ResolveItem']={{497,1}},
+},
+[30004]={
+['PaperId']=30004,
+['PaperName']='仙侠帽子(女)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=10101,
+['ResolveItem']={{497,1}},
+},
+[30005]={
+['PaperId']=30005,
+['PaperName']='仙侠帽子(男)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=10102,
+['ResolveItem']={{497,1}},
+},
+[30006]={
+['PaperId']=30006,
+['PaperName']='冒险家帽子(女)',
+['MakeMaterial']={{420,90},{422,90},{440,90},{1,70000}},
+['FashionId']=10103,
+['ResolveItem']={{497,1}},
+},
+[30007]={
+['PaperId']=30007,
+['PaperName']='冒险家帽子(男)',
+['MakeMaterial']={{420,90},{422,90},{440,90},{1,70000}},
+['FashionId']=10104,
+['ResolveItem']={{497,1}},
+},
+[30008]={
+['PaperId']=30008,
+['PaperName']='占卜师(女)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=40023,
+['ResolveItem']={{497,1}},
+},
+[30009]={
+['PaperId']=30009,
+['PaperName']='占卜师(男)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=40024,
+['ResolveItem']={{497,1}},
+},
+[30010]={
+['PaperId']=30010,
+['PaperName']='占星师(女)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=40025,
+['ResolveItem']={{497,1}},
+},
+[30011]={
+['PaperId']=30011,
+['PaperName']='占星师(男)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=40026,
+['ResolveItem']={{497,1}},
+},
+[30012]={
+['PaperId']=30012,
+['PaperName']='仙侠(女)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=40027,
+['ResolveItem']={{497,1}},
+},
+[30013]={
+['PaperId']=30013,
+['PaperName']='仙侠(男)',
+['MakeMaterial']={{404,90},{405,90},{406,90},{1,70000}},
+['FashionId']=40028,
+['ResolveItem']={{497,1}},
+},
+[30014]={
+['PaperId']=30014,
+['PaperName']='冒险家(女)',
+['MakeMaterial']={{420,90},{422,90},{440,90},{1,70000}},
+['FashionId']=40029,
+['ResolveItem']={{497,1}},
+},
+[30015]={
+['PaperId']=30015,
+['PaperName']='冒险家(男)',
+['MakeMaterial']={{420,90},{422,90},{440,90},{1,70000}},
+['FashionId']=40030,
 ['ResolveItem']={{497,1}},
 },
 }

+ 260 - 8
Assets/Lua/Config/ItemCfg2.lua

@@ -9002,7 +9002,7 @@ local ItemCfg2 = {
     --=======================================================================新增
 [30000]={
 ['Id']=30000,
-['Name']='占卜师(女)圖紙',
+['Name']='占卜师头饰(女)圖紙',
 ['ResType']=10,
 ['Quality']=3,
 ['Composition']=9999,
@@ -9023,7 +9023,7 @@ local ItemCfg2 = {
 },
 [30001]={
 ['Id']=30001,
-['Name']='占卜师(男)圖紙',
+['Name']='占卜师头饰(男)圖紙',
 ['ResType']=10,
 ['Quality']=3,
 ['Composition']=9999,
@@ -9041,20 +9041,20 @@ local ItemCfg2 = {
 ['NatureType']=0,
 ['ActivationItem']=0,
 ['ItemTimeCd']=0,
-},
+},  
 [30002]={
 ['Id']=30002,
-['Name']='占卜师头饰(女)圖紙',
+['Name']='占星师帽子(女)圖紙',
 ['ResType']=10,
 ['Quality']=3,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=0,
-['Icon']='Fashion/Cloth_0002',
+['Icon']='Fashion/Cloth_0001',
 ['MiniIcon']='',
 ['Job']=0,
-['Describe']='可以製作占卜师(女)(獲取途徑:限時禮包)',
+['Describe']='可以製作占星师帽子(女)(獲取途徑:限時禮包)',
 ['ItemTime']=0,
 ['SkipInterface']=0,
 ['DebrisShow']=0,
@@ -9062,10 +9062,136 @@ local ItemCfg2 = {
 ['NatureType']=0,
 ['ActivationItem']=0,
 ['ItemTimeCd']=0,
-},
+},    
 [30003]={
 ['Id']=30003,
-['Name']='占卜师头饰(男)圖紙',
+['Name']='占星师帽子(男)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作占星师帽子(男)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30004]={
+['Id']=30004,
+['Name']='仙侠帽子(女)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作仙侠帽子(女)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30005]={
+['Id']=30005,
+['Name']='仙侠帽子(男)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作仙侠帽子(男)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30006]={
+['Id']=30006,
+['Name']='冒险家帽子(女)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作冒险家帽子(女)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30007]={
+['Id']=30007,
+['Name']='冒险家帽子(男)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作冒险家帽子(男)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30008]={
+['Id']=30008,
+['Name']='占卜师(女)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作占卜师(女)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30009]={
+['Id']=30009,
+['Name']='占卜师(男)圖紙',
 ['ResType']=10,
 ['Quality']=3,
 ['Composition']=9999,
@@ -9084,5 +9210,131 @@ local ItemCfg2 = {
 ['ActivationItem']=0,
 ['ItemTimeCd']=0,
 },    
+[30010]={
+['Id']=30010,
+['Name']='占星师(女)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作占星师(女)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30011]={
+['Id']=30011,
+['Name']='占星师(男)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作占星师(男)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30012]={
+['Id']=30012,
+['Name']='仙侠(女)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作仙侠(女)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30013]={
+['Id']=30013,
+['Name']='仙侠(男)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作仙侠(男)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30014]={
+['Id']=30014,
+['Name']='冒险家(女)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作冒险家(女)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},    
+[30015]={
+['Id']=30015,
+['Name']='冒险家(男)圖紙',
+['ResType']=10,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=0,
+['Icon']='Fashion/Cloth_0001',
+['MiniIcon']='',
+['Job']=0,
+['Describe']='可以製作冒险家(男)(獲取途徑:限時禮包)',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},      
 }
 return ItemCfg2

+ 1 - 1
Assets/Lua/Managers/LuaBattleMgr.lua

@@ -1382,7 +1382,7 @@ end
 
 -- 完成主角创建
 function LuaBattleMgr:CreateRoleViewComplete(gameObject)
-    ManagerContainer.LuaGameMgr:CreateRoleViewComplete(gameObject,1)
+    ManagerContainer.LuaGameMgr:CreateRoleViewComplete(gameObject)
 end
 
 -- 通知战斗需要更新主角新形象