小游戏bug修复

dev_chengFeng
ZhangBiao 2020-07-16 13:45:07 +08:00
parent be9537ce9a
commit 9d47ce9767
8 changed files with 167 additions and 37 deletions

View File

@ -71542,7 +71542,7 @@ RectTransform:
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_AnchoredPosition: {x: -22, y: 0}
m_SizeDelta: {x: 337.08, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7218483298036686490
@ -74141,7 +74141,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7439249310658953764}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:

View File

@ -4623,13 +4623,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8279573323771056633}
m_RootOrder: 2
m_Father: {fileID: 6688793217172285729}
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: 15, y: -90}
m_SizeDelta: {x: 905.95, y: 261}
m_AnchoredPosition: {x: 17, y: -33}
m_SizeDelta: {x: 844.6, y: 133.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3089530176697647906
CanvasRenderer:
@ -4660,19 +4660,19 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 50
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 2
m_Text: "\u4F7F\u7528\u540E\uFF0C\u6D88\u706D\u5F53\u524D\u8BD5\u70BC\u526F\u672C\u5C42\u6240\u6709\u602A\u7269\uFF0C\u5E76\u83B7\u5F97100\u70B9\u8BD5\u70BC\u7CBE\u6C14\uFF0C\u662F\u5426\u4F7F\u7528\u3002"
m_LineSpacing: 1.1
m_Text: "\u6B21\u5143\u70B8\u5F39\u5A01\u529B\u5F88\u5927\uFF0C\u4F7F\u7528\u540E\u53EF\u6E05\u695A\u672C\u5C42\u6240\u6709\u5C0F\u602A\uFF0C\u5E76\u4E14\u53EC\u5524\u672C\u5C42BOSS"
LanguageIndex: 0
--- !u!1 &973815264405802217
GameObject:
@ -7081,11 +7081,11 @@ RectTransform:
m_Children:
- {fileID: 4776760124311478695}
m_Father: {fileID: 8279573323771056633}
m_RootOrder: 4
m_RootOrder: 3
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: 200, y: -281}
m_AnchoredPosition: {x: 168.2, y: -265.1}
m_SizeDelta: {x: 250, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6293839172155223359
@ -9400,11 +9400,11 @@ RectTransform:
m_Children:
- {fileID: 4462068544449357795}
m_Father: {fileID: 8279573323771056633}
m_RootOrder: 3
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: -200, y: -281}
m_AnchoredPosition: {x: -208.4, y: -265.1}
m_SizeDelta: {x: 250, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7237390452120883324
@ -12497,6 +12497,86 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u8FDB\u5165\u4E0B\u4E00\u5C42\u540E\u81EA\u52A8\u62FE\u53D6\u9053\u5177"
LanguageIndex: 11269
--- !u!1 &4046071708744122158
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7498778969815297584}
- component: {fileID: 2733125391278969484}
- component: {fileID: 7576300289132276930}
m_Layer: 5
m_Name: leftTime
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7498778969815297584
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4046071708744122158}
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: 6688793217172285729}
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: 22.3, y: -135.8}
m_SizeDelta: {x: 321.54, y: 38.17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2733125391278969484
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4046071708744122158}
m_CullTransparentMesh: 0
--- !u!114 &7576300289132276930
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4046071708744122158}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.86274517, b: 0.5803922, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 50
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u672C\u8F6E\u53EF\u4F7F\u7528\u6B21\u6570\uFF1A5"
LanguageIndex: 11273
--- !u!1 &4070949638201259338
GameObject:
m_ObjectHideFlags: 0
@ -17831,12 +17911,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6688793217172285729}
m_RootOrder: 1
m_RootOrder: 3
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: 142, y: -46}
m_SizeDelta: {x: 649.4, y: 105.7}
m_AnchoredPosition: {x: 11.6, y: -189.5}
m_SizeDelta: {x: 274.8, y: 43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3955148087171381323
CanvasRenderer:
@ -17859,7 +17939,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9803922, g: 0.9607844, b: 0.6666667, a: 1}
m_Color: {r: 0.9960785, g: 0.86274517, b: 0.5803922, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -17868,7 +17948,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 50
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
@ -17879,7 +17959,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5269\u4F59\u6570\u91CF\uFF1A"
m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A15"
LanguageIndex: 11273
--- !u!1 &6934346447708075645
GameObject:
@ -18860,7 +18940,6 @@ RectTransform:
m_Children:
- {fileID: 2988971679410537208}
- {fileID: 6688793217172285729}
- {fileID: 4442343951016683487}
- {fileID: 4071916887535958972}
- {fileID: 3932671958737498994}
m_Father: {fileID: 2925180131101153177}
@ -20628,11 +20707,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6688793217172285729}
m_RootOrder: 0
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: -307.4, y: 0}
m_AnchoredPosition: {x: 28, y: 116}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2112634736294590032
@ -21222,15 +21301,17 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4442343951016683487}
- {fileID: 1715173477924534089}
- {fileID: 7498778969815297584}
- {fileID: 3546515495401624831}
m_Father: {fileID: 8279573323771056633}
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: 137.13}
m_SizeDelta: {x: 936.8, y: 204.3}
m_AnchoredPosition: {x: 0, y: 28.5}
m_SizeDelta: {x: 936.8, y: 456}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8812806391208253683
GameObject:

View File

@ -1919,7 +1919,8 @@ BATTLE_TYPE = {
EXECUTE_FIGHT = 8, -- 猎妖之路
DAILY_CHALLENGE = 9, -- 日常副本
GUILD_CAR_DELAY = 10, -- 车迟斗法
DEATH_POS = 11 -- 十绝阵
DEATH_POS = 11, -- 十绝阵
Senro = 12, --森罗幻境
}
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,Id = 26 ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0},

View File

@ -754,7 +754,8 @@ function this.OnDeadCount(startTime, lastPos)
ctrlView.OnRoleDead()
-- 角色死亡不出图, 立马设置遮罩,让你瞎几把点
this.deadRoot:SetActive(true)
-- this.deadRoot:SetActive(true)
UIManager.OpenPanel(UIName.BattleFailPopup,nil,false,nil,12)
-- 无尽副本中死亡扣行动力
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
@ -788,7 +789,7 @@ function this.OnDeadCount(startTime, lastPos)
if index == 0 then
this.RoleRelife(timer, index)
end
end, 1, deadTime, true)
end, 0.5, deadTime, true)
timer:Start()
end
@ -799,7 +800,8 @@ function this.RoleRelife(timer, deadTime)
MapManager.deadTime = 0
timer:Stop()
-- 隐藏面板
this.deadRoot:SetActive(false)
-- this.deadRoot:SetActive(false)
UIManager.ClosePanel(UIName.BattleFailPopup)
-- 初始化路径
ctrlView.InitPath()

View File

@ -126,7 +126,7 @@ function TrialMapPanel:BindEvent()
Util.AddClick(this.btnBomb, function ()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialBomb)
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialBomb,1)
-- bombNum = BagManager.GetTempBagCountById(43)
-- this.bombNum.text = bombNum
-- LogGreen(bombNum)
@ -403,10 +403,10 @@ function this.RefreshBombNum()
-- 试炼副本才执行
bombNum = 0
if CarbonManager.difficulty ~= CARBON_TYPE.TRIAL then return end
if BagManager.GetTempBagCountById(43) == 0 or not BagManager.GetTempBagCountById(43) then
if BagManager.GetItemCountById(43) == 0 or not BagManager.GetItemCountById(43) then
bombNum = 0
else
bombNum = BagManager.GetTempBagCountById(43)
bombNum = BagManager.GetItemCountById(43)
end
this.bombNum.text = bombNum

View File

@ -78,6 +78,7 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType)
end
FightPointPassManager.FightBattleEnd()
Util.GetGameObject(this.btnClose, "record"):SetActive(m_showRecord)
Util.GetGameObject(this.btnClose,"tip"):SetActive(not fightType ==12)--副本内无法点击招募
end

View File

@ -5,18 +5,21 @@ local parent
--传入特效层级
local sortingOrder=0
local ctrlView = require("Modules/Map/View/MapControllView")
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local trialSetting=ConfigManager.GetConfig(ConfigName.TrialSetting)
local trialConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
local item
local itemId=0 --消耗道具ID
local itemNum=0 --消耗道具数量
local usedNum=0 --已使用的数量
function this:InitComponent(gameObject)
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
this.body=Util.GetGameObject(gameObject,"Body")
this.item=Util.GetGameObject(this.body,"Item")
-- this.time=Util.GetGameObject(this.body,"Time"):GetComponent("Text")
this.leftTime=Util.GetGameObject(this.body,"leftTime"):GetComponent("Text")
this.num=Util.GetGameObject(this.body,"Num"):GetComponent("Text")
-- this.root=Util.GetGameObject(gameObject,"Rot"):GetComponent("Text")
this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")
@ -37,9 +40,31 @@ function this:BindEvent()
PopupTipPanel.ShowTip(Language[11248])
return
else
UIManager.OpenPanel(UIName.TrialOpPanel, 2)
-- UIManager.OpenPanel(UIName.TrialOpPanel, 2)
-- 停止自动寻路
-- ctrlView.OnRoleDead()
--tiralOPpanel里面
--向服务器请求使用炸弹
MapManager.MapUpdateEvent(-1000, function ()
Log(Language[11270])
NetManager.RequestUseBomb(function (msg)
Log(Language[11271] .. #msg.drop.itemlist)
ctrlView.CallListPop()
-- 更新背包数量
BagManager.DeleteTempBagCountById(43, 1)
this.KillAllBitch()
local showDrop = function()
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 2, function ()
-- 回复精气值
MapTrialManager.UpdatePowerValue(msg.essenceValue)
end)
end
parent:ClosePanel()
end)
end)
end
else
PopupTipPanel.ShowTip(Language[11249])
@ -47,6 +72,21 @@ function this:BindEvent()
end)
end
-- 弄死所有的小怪
function this:KillAllBitch()
--杀死所有的小怪
MapManager.isRemoving = true
local pointData = trialConfig[MapTrialManager.curTowerLevel].MonsterPoint --MonsterPoint
for i = 1, #pointData do
local mapPointId = pointData[i][1]
if mapPointId then
LogPink(Language[11266] .. mapPointId)
MapManager.DeletePos(mapPointId)
end
end
MapManager.isRemoving = false
end
function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.RefreshPanel)--监听背包信息改变刷新 用于回春散数量刷新
end
@ -60,8 +100,11 @@ function this:OnShow(_parent,...)
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
local _args = {...}
itemId=trialSetting[1].BombId[1][1]
itemNum= BagManager.GetItemCountById(itemId)
-- LogBlue(BagManager.GetItemCountById(itemId))
usedNum=_args[1]
this.RefreshPanel()
end
@ -77,7 +120,8 @@ end
function this.RefreshPanel()
item:OnOpen(false, {itemId,1}, 1.2,false,false,false,sortingOrder)
item:Reset({itemId,1},ItemType.NoType,{nil,false,nil,false})
this.num.text=Language[11657]..BagManager.GetItemCountById(itemId)
this.num.text=Language[11657]..itemNum
this.leftTime.text=Language[11656]..trialSetting[1].PrivilegeReward[2]-usedNum
end
return this

View File

@ -97,7 +97,8 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId)
this.shopItemData = ShopManager.GetShopItemData(shopType, shopItemId)
-- 商品基础信息显示
this.itemName.text = this.shopItemInfo.GoodsName
-- this.itemName.text = this.shopItemInfo.GoodsName
this.itemName.text = itemConfig[this.shopItemInfo.Goods[1][1]].Name
this.goods = ShopManager.GetShopItemGoodsInfo(this.shopItemId)
local goodsId = this.goods[1][1]
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)