【七界试炼】完成!!!
parent
949d159010
commit
8307fbe7e1
|
@ -5221,7 +5221,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8449503326337241798}
|
m_Father: {fileID: 8449503326337241798}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
@ -11531,7 +11531,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8449503326337241798}
|
m_Father: {fileID: 8449503326337241798}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
@ -12715,7 +12715,7 @@ RectTransform:
|
||||||
- {fileID: 1320131006639529802}
|
- {fileID: 1320131006639529802}
|
||||||
- {fileID: 551277871613032532}
|
- {fileID: 551277871613032532}
|
||||||
m_Father: {fileID: 8449503326337241798}
|
m_Father: {fileID: 8449503326337241798}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 6
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
@ -14513,6 +14513,80 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2914639370631911662}
|
m_GameObject: {fileID: 2914639370631911662}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!1 &2924398701083828760
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5626140484521440935}
|
||||||
|
- component: {fileID: 5197636959171832760}
|
||||||
|
- component: {fileID: 4620074408684107416}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: kuang
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &5626140484521440935
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2924398701083828760}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 8449503326337241798}
|
||||||
|
m_RootOrder: 2
|
||||||
|
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: 0, y: 171}
|
||||||
|
m_SizeDelta: {x: 220, y: 220}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5197636959171832760
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2924398701083828760}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4620074408684107416
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2924398701083828760}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 2cb8d13c044207c41903b893f210c79b, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &2949220950095461633
|
--- !u!1 &2949220950095461633
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -15579,7 +15653,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 3477349743183870687}
|
- {fileID: 3477349743183870687}
|
||||||
m_Father: {fileID: 8449503326337241798}
|
m_Father: {fileID: 8449503326337241798}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 7
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
@ -31521,6 +31595,80 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7014052985923824080}
|
m_GameObject: {fileID: 7014052985923824080}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!1 &7051622087955825020
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2438777691710621081}
|
||||||
|
- component: {fileID: 3672373688049479530}
|
||||||
|
- component: {fileID: 7326938245357756770}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: light
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2438777691710621081
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7051622087955825020}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 8449503326337241798}
|
||||||
|
m_RootOrder: 1
|
||||||
|
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: 0, y: 171}
|
||||||
|
m_SizeDelta: {x: 220, y: 220}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3672373688049479530
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7051622087955825020}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7326938245357756770
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7051622087955825020}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 494d33f63df77424085149b5b50f4319, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &7093571060650879715
|
--- !u!1 &7093571060650879715
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -31783,6 +31931,8 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 258268505522485135}
|
- {fileID: 258268505522485135}
|
||||||
|
- {fileID: 2438777691710621081}
|
||||||
|
- {fileID: 5626140484521440935}
|
||||||
- {fileID: 406794874836108511}
|
- {fileID: 406794874836108511}
|
||||||
- {fileID: 2975617786207396744}
|
- {fileID: 2975617786207396744}
|
||||||
- {fileID: 7819689112261450393}
|
- {fileID: 7819689112261450393}
|
||||||
|
@ -33653,7 +33803,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8449503326337241798}
|
m_Father: {fileID: 8449503326337241798}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
|
@ -95,7 +95,6 @@ function QiJieTreasure:SetTabBox()
|
||||||
end
|
end
|
||||||
|
|
||||||
function QiJieTreasure:Refresh(_tabNum)
|
function QiJieTreasure:Refresh(_tabNum)
|
||||||
LogRed("_tabNum:"..tostring(_tabNum))
|
|
||||||
self.dataList = QiJieShiLianManager.FormatTreasureData(_tabNum)
|
self.dataList = QiJieShiLianManager.FormatTreasureData(_tabNum)
|
||||||
self.treasureNum.text = string.format( "%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList)
|
self.treasureNum.text = string.format( "%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList)
|
||||||
self.ScrollView:SetData(self.dataList, function(index, go)
|
self.ScrollView:SetData(self.dataList, function(index, go)
|
||||||
|
|
|
@ -5,12 +5,23 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||||
local QijieHolyConfig=ConfigManager.GetConfig(ConfigName.QijieHolyConfig)
|
local QijieHolyConfig=ConfigManager.GetConfig(ConfigName.QijieHolyConfig)
|
||||||
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||||
|
|
||||||
|
local QUALITY = {
|
||||||
|
-- [1] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||||
|
[2] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||||
|
[3] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
|
||||||
|
[4] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
|
||||||
|
[5] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
|
||||||
|
[6] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
|
||||||
|
-- [7] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||||
|
}
|
||||||
|
|
||||||
function QiJieSingleTreasure:InitComponent(gameObject)
|
function QiJieSingleTreasure:InitComponent(gameObject)
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
self.attriText = Util.GetGameObject(gameObject,"AttriText"):GetComponent("Text")
|
self.attriText = Util.GetGameObject(gameObject,"AttriText"):GetComponent("Text")
|
||||||
self.title = Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
self.title = Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
||||||
self.Img = Util.GetGameObject(gameObject,"Image"):GetComponent("Image")
|
self.Img = Util.GetGameObject(gameObject,"Image"):GetComponent("Image")
|
||||||
|
self.light = Util.GetGameObject(gameObject,"light"):GetComponent("Image")
|
||||||
|
self.kuang = Util.GetGameObject(gameObject,"kuang"):GetComponent("Image")
|
||||||
self.cost = Util.GetGameObject(gameObject,"cost")
|
self.cost = Util.GetGameObject(gameObject,"cost")
|
||||||
self.costIcon = Util.GetGameObject(gameObject,"cost/Icon"):GetComponent("Image")
|
self.costIcon = Util.GetGameObject(gameObject,"cost/Icon"):GetComponent("Image")
|
||||||
self.costNum = Util.GetGameObject(gameObject,"cost/Num"):GetComponent("Text")
|
self.costNum = Util.GetGameObject(gameObject,"cost/Num"):GetComponent("Text")
|
||||||
|
@ -45,7 +56,13 @@ end
|
||||||
function QiJieSingleTreasure:Refresh()
|
function QiJieSingleTreasure:Refresh()
|
||||||
self.title.text = self.data.Name
|
self.title.text = self.data.Name
|
||||||
self.Img.sprite = self.spLoader:LoadSprite(artResourcesConfig[self.data.Icon].Name)
|
self.Img.sprite = self.spLoader:LoadSprite(artResourcesConfig[self.data.Icon].Name)
|
||||||
|
self.light.sprite = self.spLoader:LoadSprite(QUALITY[self.data.Quality].light)
|
||||||
|
self.kuang.sprite = self.spLoader:LoadSprite(QUALITY[self.data.Quality].kuang)
|
||||||
|
Util.SetGray(self.Img.gameObject,self.data.state == 2)
|
||||||
|
Util.SetGray(self.kuang.gameObject,self.data.state == 2)
|
||||||
|
self.light.gameObject:SetActive(self.data.state == 1)
|
||||||
if self.data.state == 2 then
|
if self.data.state == 2 then
|
||||||
|
self.cost:SetActive(true)
|
||||||
self.costIcon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(self.data.Cost[1]))
|
self.costIcon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(self.data.Cost[1]))
|
||||||
local text1 = string.format( "%s/%s",BagManager.GetTotalItemNum(self.data.Cost[1]),self.data.Cost[2])
|
local text1 = string.format( "%s/%s",BagManager.GetTotalItemNum(self.data.Cost[1]),self.data.Cost[2])
|
||||||
if BagManager.GetTotalItemNum(self.data.Cost[1]) < self.data.Cost[2] then
|
if BagManager.GetTotalItemNum(self.data.Cost[1]) < self.data.Cost[2] then
|
||||||
|
|
|
@ -149,8 +149,9 @@ end
|
||||||
|
|
||||||
--把服务器发来的遗物数据加到本地数据中
|
--把服务器发来的遗物数据加到本地数据中
|
||||||
function this.MixTreasureServerAndLocalData(msg)
|
function this.MixTreasureServerAndLocalData(msg)
|
||||||
this.treasureActiveList = msg.info
|
this.treasureActiveList = {}
|
||||||
for i = 1, #msg.info do
|
for i = 1, #msg.info do
|
||||||
|
table.insert(this.treasureActiveList,msg.info[i].id)
|
||||||
if this.treasureList[msg.info[i].id] then
|
if this.treasureList[msg.info[i].id] then
|
||||||
this.treasureList[msg.info[i].id].state = msg.info[i].status
|
this.treasureList[msg.info[i].id].state = msg.info[i].status
|
||||||
else
|
else
|
||||||
|
@ -211,8 +212,9 @@ function this.GetTreasureEffect(treasureList)
|
||||||
local moneyNum = 0
|
local moneyNum = 0
|
||||||
local attriList1 = {}
|
local attriList1 = {}
|
||||||
local attriList2 = {}
|
local attriList2 = {}
|
||||||
|
LogYellow(tostring(#treasureList))
|
||||||
for i = 1, #treasureList do
|
for i = 1, #treasureList do
|
||||||
-- LogYellow("treasureList[i]"..tostring(treasureList[i]))
|
LogYellow(tostring(treasureList[i]))
|
||||||
local tData = QijieHolyConfig[treasureList[i]]
|
local tData = QijieHolyConfig[treasureList[i]]
|
||||||
--界灵数量加成
|
--界灵数量加成
|
||||||
moneyNum = moneyNum + tData.Addition
|
moneyNum = moneyNum + tData.Addition
|
||||||
|
|
Loading…
Reference in New Issue