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

dev_chengFeng
ZhangBiao 2020-07-17 16:06:01 +08:00
commit ea564d7a7d
18 changed files with 109 additions and 3 deletions

View File

@ -0,0 +1,43 @@
fileFormatVersion: 2
guid: 09413979b6ea9a34a86f1dd74c3ed679
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides:
1:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
4:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
7:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,43 @@
fileFormatVersion: 2
guid: c3a6856840ebd9642ad750223fed0c08
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides:
1:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
4:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
7:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -47,7 +47,7 @@ local monsterArea = {
y_pos = {min = 10, max = 15},
},
[5002] = {
x_pos = {min = 8, max = 30},
x_pos = {min = 9, max = 28},
y_pos = {min = 8, max = 16},
},
[5003] = {

View File

@ -75,6 +75,7 @@ function this.SetCardSingleData(go,monsterId,_pos)
local curPos=roleConfig[heroConfig.Id].offset
liveNodes[_pos] = poolManager:LoadLive(liveNames[_pos], live.transform, Vector3.one * _scale, Vector3.New(curPos[1],curPos[2],0))
liveNodes[_pos]:GetComponent("SkeletonGraphic").raycastTarget=false
liveNodes[_pos]:GetComponent("RectTransform").sizeDelta = Vector2.New(500, 500)
end
--界面关闭时调用(用于子类重写)
function GuildCarDelayFindBossPopup:OnClose()

View File

@ -196,6 +196,21 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
end)
elseif _itemData.configData.ItemType == ItemType.Equip then
--装备
self.num:SetActive(_itemData.num > 1)
self.num:GetComponent("Text").text = _itemData.num
self.name:GetComponent("Text").text = _itemData.configData.Name
self.starGrid:SetActive(true)
EquipManager.SetEquipStarShow(self.starGrid, _itemData.configData.Id)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop)
end)
if effectLayer > 0 then
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5 or _itemData.configData.Quantity == 4)
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity == 6)
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity == 7)
end
elseif _itemData.configData.ItemType == ItemType.Blueprint then
local lanTuData = WorkShopManager.GetLanTuIsOpenLock(_itemData.backData.itemId)
if lanTuData then
@ -223,7 +238,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
self.num:SetActive(_itemData.num > 1)
self.num:GetComponent("Text").text = _itemData.num
self.name:GetComponent("Text").text = _itemData.configData.Name
EquipManager.SetEquipStarShow(self.starGrid,_itemData.configData.Id)
self.starGrid:SetActive(true)
EquipManager.SetEquipStarShow(self.starGrid, _itemData.configData.Id)
Util.AddOnceClick(self.frameBtn, function()
--Log("self.isRewardItemPop "..tostring(self.isRewardItemPop))
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop)
@ -380,6 +396,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.num:GetComponent("Text").text = PrintWanNum(itemNum and itemNum or 0)
self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
self.starGrid:SetActive(true)
EquipManager.SetEquipStarShow(self.starGrid,itemSId)
if effectLayer > 0 then
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity == 5 or itemDataConFig.Quantity == 4)

View File

@ -68,7 +68,9 @@ public class GameStart : MonoBehaviour
DestroyImmediate(gameObj2);
if (bundle != null) bundle.Unload(true);
bundle = null;
StartCoroutine(playMovice());
App.Instance.Initialize();
UpdateManager.Instance.StartUp();
//StartCoroutine(playMovice());
});
});
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.