Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
JieLing 2020-08-24 16:56:52 +08:00
commit 4496fa67a6
9 changed files with 209 additions and 16 deletions

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7721468065601089189
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4464239834348640749}
- component: {fileID: 2643560322446384109}
- component: {fileID: 8466920518216357046}
m_Layer: 0
m_Name: live2d_npc_map
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4464239834348640749
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7721468065601089189}
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: 0}
m_RootOrder: 0
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: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2643560322446384109
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7721468065601089189}
m_CullTransparentMesh: 0
--- !u!114 &8466920518216357046
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7721468065601089189}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
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
skeletonDataAsset: {fileID: 11400000, guid: df18fda9517bbe149807dd2370a5ec52, type: 2}
initialSkinName: default
initialFlipX: 0
initialFlipY: 0
startingAnimation: idle
startingLoop: 1
timeScale: 1
freeze: 0
unscaledTime: 0
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
pmaVertexColors: 1
tintBlack: 0
calculateTangents: 0
addNormals: 0
immutableTriangles: 0

View File

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

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6215064165438005737
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 747127079216296264}
- component: {fileID: 7703660334273445023}
- component: {fileID: 7396289312394494236}
m_Layer: 0
m_Name: live2d_npc_map_nv
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &747127079216296264
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6215064165438005737}
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: 0}
m_RootOrder: 0
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: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7703660334273445023
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6215064165438005737}
m_CullTransparentMesh: 0
--- !u!114 &7396289312394494236
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6215064165438005737}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
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
skeletonDataAsset: {fileID: 11400000, guid: 797d02381f7ed57458ebbceefb9aa0c6, type: 2}
initialSkinName: default
initialFlipX: 0
initialFlipY: 0
startingAnimation: idle
startingLoop: 1
timeScale: 1
freeze: 0
unscaledTime: 0
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
pmaVertexColors: 1
tintBlack: 0
calculateTangents: 0
addNormals: 0
immutableTriangles: 0

View File

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

View File

@ -2213,7 +2213,7 @@ Language = {
[12212] = "宝物分解",
[12213] = "无可分解宝物!",
[12214] = "最多选择%s个宝物",
[12215] = "请选择需要分解的宝!",
[12215] = "请选择需要分解的宝!",
[12216] = "这里?",
[12217] = "无法用于无限循环的方法",
[12218] = "未命中",
@ -2271,8 +2271,8 @@ Language = {
[12270] = "材料",
[12271] = "(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>装备!)",
[12272] = "出售数量不可为0个",
[12273] = "宝物将分解为宝魂若宝物已强化或精炼分解后将清空强化和精炼等级并100%返还养成材料。",
[12274] = "(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝)",
[12273] = "宝物将分解为",
[12274] = "(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝)",
[12275] = "分解后获得:",
[12276] = "神将归元成功,等级重置为1级",
[12277] = "未查询到符合条件的装备!",
@ -2292,4 +2292,5 @@ Language = {
[12291] = "请选择需要合成的神将",
[12292] = "%s星同阵营神将",
[12293] = "完成上方任务即可免费领取神将",
[12294] = "若宝物已强化或精炼分解后将清空强化和精炼等级并100%返还养成材料。",
}

View File

@ -61,7 +61,7 @@ function ExpeditionMainPanel:InitComponent()
--self.mask = Util.GetGameObject(self.parent, "mask")
--self.mask:SetActive(false)
npc = NameManager.roleSex == ROLE_SEX.BOY and "live2d_npc_map" or "live2d_npc_map_nv"
local scale = NameManager.roleSex == ROLE_SEX.BOY and Vector3.one*0.2 or Vector3.one * 0.12
local scale = NameManager.roleSex == ROLE_SEX.BOY and Vector3.one * 0.26 or Vector3.one * 0.26
self.liveNode = poolManager:LoadLive(npc, Util.GetTransform(self.parent, "playerLive"), scale, Vector3.zero)
SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic")
if SkeletonGraphic then

View File

@ -33,15 +33,21 @@ function MainPlayerView.New(isSelf, root, rect, pos)
scale = sex == ROLE_SEX.BOY and 1 or 0.5
instance.NpcGO = poolManager:LoadAsset(npc, PoolManager.AssetType.GameObject)
instance.NpcGO:SetActive(true)
instance.NpcGO.transform:SetParent(instance.roleRootTran)
instance.NpcGO.transform.localPosition = Vector3.zero
instance.NpcGO.transform.localScale = Vector3.one * 1.3 * scale
instance.NpcGO.name = "npc"
instance.SkeletonGraphic = Util.GetGameObject(instance.leader, "roleRoot/npc"):GetComponent("SkeletonAnimation")
instance.SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
instance.SkeletonGraphic.transform.localEulerAngles = Vector3.zero
if not instance.NpcGO then
LogRed("npc:"..npc.."资源不存在")
else
instance.NpcGO:SetActive(true)
instance.NpcGO.transform:SetParent(instance.roleRootTran)
instance.NpcGO.transform.localPosition = Vector3.zero
instance.NpcGO.transform.localScale = Vector3.one * 1.3 * scale
instance.NpcGO.name = "npc"
instance.SkeletonGraphic = Util.GetGameObject(instance.leader, "roleRoot/npc"):GetComponent("SkeletonAnimation")
instance.SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
instance.SkeletonGraphic.transform.localEulerAngles = Vector3.zero
end
instance.rect = rect
instance.leader:GetComponent("RectTransform").anchoredPosition = pos
instance.lastPos = pos

View File

@ -83,7 +83,8 @@ function this:OnShow(_parent,...)
isEquipShowSure=true
end
end
this.bodyText.text= string.format( Language[12273],ConfigManager.GetConfigData(ConfigName.ItemConfig,29))
local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,29).Name
this.bodyText.text= Language[12273]..itemName..Language[12294]
this.bodyText2:GetComponent("Text").text=Language[12274]
this.bodyText2.gameObject:SetActive(isEquipShowSure)
this.tipText.text = Language[12275]

View File

@ -592,7 +592,7 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData)
for i, v in pairs(selectEquipTreasureData) do
local curEquipTreasureData = allTreasures[i]
if not curEquipTreasureData then return end
--先把精炼的材料放进去 因为有宝器 放前边
--先把精炼的材料放进去 因为有宝器 放前边
if curEquipTreasureData.refineLv > 0 then
for i=0,curEquipTreasureData.refineLv-1 do
local refineJewelRankupConfig =ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",2,"Level",i,"PoolID",curEquipTreasureData.refinePool)
@ -618,7 +618,8 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData)
end
if curEquipTreasureData.lv > 0 then
for i=0,curEquipTreasureData.lv - 1 do
local lvJewelRankupConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",1,"Level",i,"PoolID",curEquipTreasureData.LevelupPool)
local lvJewelRankupConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",1,"Level",i,"PoolID",curEquipTreasureData.levelPool)
if lvJewelRankupConfig then
--强化消耗的材料
if lvJewelRankupConfig.UpExpend then