【命格】提交

dev_chengFeng
ZhangBiao 2021-12-09 13:29:16 +08:00
parent 7bcc95f31f
commit 9875630085
15 changed files with 3546 additions and 15 deletions

View File

@ -196,6 +196,7 @@ RectTransform:
- {fileID: 477055730160816385}
- {fileID: 4422558607796476224}
- {fileID: 477069144886645859}
- {fileID: 8469709207579252975}
- {fileID: 476462756984414603}
- {fileID: 476880290243533489}
- {fileID: 3779449671139551203}
@ -2411,7 +2412,7 @@ RectTransform:
m_Children:
- {fileID: 476257756925467703}
m_Father: {fileID: 224457215098483846}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2891,7 +2892,7 @@ RectTransform:
m_Children:
- {fileID: 476675878081608361}
m_Father: {fileID: 224457215098483846}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -9157,7 +9158,7 @@ RectTransform:
m_Children:
- {fileID: 2497514767653050968}
m_Father: {fileID: 224457215098483846}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -9500,7 +9501,7 @@ RectTransform:
m_Children:
- {fileID: 396553229042369325}
m_Father: {fileID: 224457215098483846}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -9662,6 +9663,143 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2661117664445193188
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8469709207579252975}
- component: {fileID: 659177518895935053}
- component: {fileID: 2848098635888886817}
- component: {fileID: 3611656641686186972}
- component: {fileID: 2171969241514423021}
m_Layer: 5
m_Name: onekey
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8469709207579252975
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2661117664445193188}
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: 224457215098483846}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -93, y: 351.5}
m_SizeDelta: {x: 127, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &659177518895935053
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2661117664445193188}
m_CullTransparentMesh: 0
--- !u!114 &2848098635888886817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2661117664445193188}
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: 049027c3ae7174b4ead9dd4e5f17b062, 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!114 &3611656641686186972
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2661117664445193188}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2848098635888886817}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &2171969241514423021
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2661117664445193188}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &2687213736092790001
GameObject:
m_ObjectHideFlags: 0
@ -15254,7 +15392,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224457215098483846}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -30551,7 +30689,7 @@ RectTransform:
m_Children:
- {fileID: 3760438259093134196}
m_Father: {fileID: 224457215098483846}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -37215,7 +37353,7 @@ RectTransform:
m_Children:
- {fileID: 568030099109615014}
m_Father: {fileID: 224457215098483846}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -37902,7 +38040,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224457215098483846}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}

File diff suppressed because it is too large Load Diff

View File

@ -2293,6 +2293,7 @@ GENERAL_POPUP_TYPE={
YuJianXingRecord = 51, --御剑行竞猜界面
YuJianXingBetSelectNum = 53,--御剑行竞猜数量界面
LingMaiJump = 56,--灵脉跳转界面
GemOneKey = 60, --命石一键合成
--大号通用弹窗
YiJingBaoKu = 30,--易经宝库
@ -2323,7 +2324,8 @@ GENERAL_POPUP_TYPE={
IncarnationDes = 56,
chooseTailsManSoul = 57,
SelectGem = 58,
SelectGem = 58, --命石选择
GemCompound = 59, --命石合成
}
--通用信息弹窗类型

View File

@ -35,8 +35,8 @@ function BagPanel:InitComponent()
this.selectBtn1:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_xuanze_001")
this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform)
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
this.Ta = Util.GetGameObject(self.gameObject, "fenJieBtn")
this.fenJieBtn = Util.GetGameObject(self.gameObject, "fenJieBtn")
this.oneKey = Util.GetGameObject(self.gameObject, "onekey")
this.itemNumText = Util.GetGameObject(self.gameObject, "itemNumText")
this.ItemView = Util.GetGameObject(self.gameObject, "ItemView")
this.ItemViewEffect = Util.GetGameObject(self.gameObject, "ItemView/GameObject/effects")
@ -119,6 +119,9 @@ function BagPanel:BindEvent()
Util.AddClick(this.tabsBtn, function()
this:MoveTabs()
end)
Util.AddClick(this.oneKey, function()
UIManager.OpenPanel(UIName.GeneralPopup, GENERAL_POPUP_TYPE.GemOneKey)
end)
for i = 1, 5 do
Util.AddOnceClick(this.tabsList[i],function ()
@ -168,6 +171,7 @@ function this:SetSelectBtn(_btn)
this.tabsBtn:SetActive(sortIndex == ItemBaseType.EquipTreasure)
this.fenJieBtn:SetActive(sortIndex == ItemBaseType.SoulPrint or sortIndex == ItemBaseType.Equip or sortIndex == ItemBaseType.EquipTreasure)--装备
this.fenJieBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(tostring(ImgList[sortIndex]))--装备
this.oneKey:SetActive(sortIndex == ItemBaseType.Gem)
this.itemNumText:SetActive(sortIndex == ItemBaseType.Equip or sortIndex == ItemBaseType.SoulPrint or sortIndex == ItemBaseType.EquipTreasure)--装备 法宝
end

View File

@ -73,10 +73,10 @@ function this.GetAllAttri()
end
end
end
-- table.sort(data,function (a,b)
-- return propertyConfig[a.id].SortId < propertyConfig[b.id].SortId
-- end)
return data
end
function this.OneKeyConpound()
end
return this

View File

@ -42,7 +42,9 @@ local contentScripts = {
--寻仙招募选择up英雄
[GENERAL_POPUP_TYPE.ChooseUpHero] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpHero"), panelName = "GeneralBigPopup_ChooseUpHero"},
--命格选择命石
[GENERAL_POPUP_TYPE.SelectGem] = {view = require("Modules/Popup/View/GeneralBigPopup_SelectGem"), panelName = "GeneralBigPopup_SelectGem"},
[GENERAL_POPUP_TYPE.SelectGem] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_SelectGem"), panelName = "GeneralBigPopup_SelectGem"},
--命石合成
[GENERAL_POPUP_TYPE.GemCompound] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_GemCompound"), panelName = "GeneralBigPopup_GemCompound"},
}
--子模块预设
local contentPrefabs={}

View File

@ -0,0 +1,105 @@
----- 命格选择命石 -----
local GemCompound = {}
--传入父脚本模块
local parent
--传入特效层级
local sortingOrder=0
local args=nil
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local gemConfig=ConfigManager.GetConfig(ConfigName.GemConfig)
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
function GemCompound:InitComponent(gameObject)
self.spLoader = SpriteLoader.New()
self.curGem = Util.GetGameObject(gameObject,"Gems/curGem")
self.targetGem = Util.GetGameObject(gameObject,"Gems/targetGem")
self.proGrid = Util.GetGameObject(gameObject,"Property")
self.proPre = Util.GetGameObject(self.proGrid,"propertyPre")
self.proPre:SetActive(false)
--滚动条根节点
self.root = Util.GetGameObject(gameObject, "Cost/Scroll")
self.itemPre = Util.GetGameObject(self.root,"itemPre")
self.proList={}
self.itemList={}
local rootHight = self.root.transform.rect.height
local width = self.root.transform.rect.width
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.root.transform,
self.itemPre,nil, Vector2.New(width, rootHight), 1, 1,Vector2.New(0,10))
self.ScrollView.moveTween.MomentumAmount = 1
self.ScrollView.moveTween.Strength = 2
self.ScrollView.elastic = false
end
function GemCompound:BindEvent()
end
function GemCompound:AddListener()
end
function GemCompound:RemoveListener()
end
function GemCompound:OnShow(_parent,_args)
args = _args
parent=_parent
sortingOrder =_parent.sortingOrder
GemCompound:Refresh(args[1])
end
function GemCompound:Refresh(Id)
-- local dataList = GemManager.GetGemsFromBagByType(Id)
-- self.ScrollView:SetData(dataList, function(index, go)
-- self:SingleDataShow(go,dataList[index],index)
-- go:SetActive(true)
-- end)
--设置当前和目标命石
if not self.curGemObj then
self.curGemObj = SubUIManager.Open(SubUIConfig.ItemView,self.curGem.transform)
self.targetGemObj = SubUIManager.Open(SubUIConfig.ItemView,self.targetGem.transform)
end
self.curGemObj:OnOpen(false, {Id,0}, 1.1, true,false,false,sortingOrder + 1)
self.targetGemObj:OnOpen(false, {Id + 1,0}, 1.1, true,false,false,sortingOrder + 1)
--设置属性
local data1,data2 = gemConfig[Id].Property,gemConfig[Id+1].Property
for i = 1, #data1 do
local go = self.proList[i]
if not go then
go = newObjToParent(self.proPre,self.proGrid.transform)
self.proList[i] = go
end
go:SetActive(true)
local proText = Util.GetGameObject(go,"proText"):GetComponent("Text")
local nextProText = Util.GetGameObject(go,"nextProText"):GetComponent("Text")
local upProText = Util.GetGameObject(go,"upProText"):GetComponent("Text")
proText.text = string.format("全体%s+%s",PropertyConfig[data1[i][1]].Info,data1[i][2]/100).."%"
nextProText.text = string.format("%s",data2[i][2]/100).."%"
upProText.text = string.format("%s",(data2[i][2]-data1[i][2])/100).."%"
end
--设置消耗
self:SetCost(1)
end
function GemCompound:SetCost(type)
end
function GemCompound:SingleDataShow(go,data,index)
end
function GemCompound:OnClose()
args=nil
end
function GemCompound:OnDestroy()
self.spLoader:Destroy()
self.itemList={}
self.proList={}
self.curGemObj = nil
self.targetGemObj = nil
end
return GemCompound

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: afefa750eecc6a541be0ff26f1f91f7a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9ea1cc321acca1a48b2cade5dc25d038
guid: 1dce9d3de0a408546b63bd2631ac74d7
DefaultImporter:
externalObjects: {}
userData:

View File

@ -84,6 +84,8 @@ local contentScripts = {
[GENERAL_POPUP_TYPE.YuJianXingBetSelectNum] = {view = require("Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum"), panelName = "GeneralPopup_YuJianXingBetSelectNum"},
--灵脉跳转界面
[GENERAL_POPUP_TYPE.LingMaiJump] = {view = require("Modules/Popup/View/GeneralPopup_LingMaiJump"), panelName = "GeneralPopup_LingMaiJump"},
--命石一键合成
[GENERAL_POPUP_TYPE.GemOneKey] = {view = require("Modules/Popup/View/GeneralPopup_GemOneKey"), panelName = "GeneralPopup_GemOneKey"},
}
--子模块预设
local contentPrefabs={}

View File

@ -70,6 +70,11 @@ function RewardGemSingleShowPopup:BindEvent()
end)
end)
Util.AddClick(this.btnJump, function()--合成
if this.openType == 2 then
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,function ()
self:ClosePanel()
end)
end
end)
end

View File

@ -0,0 +1,38 @@
----灵脉跳转界面 -----
local this = {}
--传入父脚本模块
local parent
--传入特效层级
local sortingOrder=0
function this:InitComponent(gameObject)
self.spLoader = SpriteLoader.New()
self.btnSure = Util.GetGameObject(gameObject,"BtnSure")
self.btnCancel = Util.GetGameObject(gameObject,"BtnCancel")
end
function this:BindEvent()
end
function this:AddListener()
end
function this:RemoveListener()
end
function this:OnShow(_parent)
self.parent = _parent
self:Refresh()
end
function this:Refresh()
end
function this:OnClose()
end
function this:OnDestroy()
this.spLoader:Destroy()
end
return this

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ae02ba186910f0b488f15875121ef156
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: