Merge branch 'china/dev' into china/dev-c

dev_chengFeng
ZhangBiao 2021-04-29 14:35:28 +08:00
commit ecccb455a2
11 changed files with 46 additions and 24 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -69,6 +69,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -69,6 +69,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 KiB

After

Width:  |  Height:  |  Size: 262 KiB

View File

@ -4706,7 +4706,7 @@ ParticleSystem:
--- !u!199 &1113217062395620073
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -4741,7 +4741,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 205
m_SortingOrder: 1
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -9398,7 +9398,7 @@ ParticleSystem:
--- !u!199 &4815148930500829943
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9433,7 +9433,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 211
m_SortingOrder: 2
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -14055,7 +14055,7 @@ ParticleSystem:
--- !u!199 &1940909402510411175
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14090,7 +14090,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 211
m_SortingOrder: 2
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -18793,7 +18793,7 @@ ParticleSystem:
--- !u!199 &3145150861859057568
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -18828,7 +18828,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 211
m_SortingOrder: 2
m_RenderMode: 1
m_SortMode: 0
m_MinParticleSize: 0
@ -23450,7 +23450,7 @@ ParticleSystem:
--- !u!199 &8324614838058179502
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -23485,7 +23485,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 211
m_SortingOrder: 2
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0

View File

@ -33,7 +33,7 @@ local monsterArea = {
y_pos = {min = 8, max = 16},
},
[5003] = {
x_pos = {min = 9, max = 27},
x_pos = {min = 8, max = 28},
y_pos = {min = 8, max = 14},
},
[5004] = {

View File

@ -483,9 +483,11 @@ function this.ShowStory(nextId,OnFocus)
if isShowStory == 1 then
LogGreen("this.gameObject:"..this.gameObject.name)
this.gameObject:SetActive(false)
Game.GlobalEvent:AddEvent(GameEvent.GuaJi.CloseStoryMapPanel,function()
this.GameSetActive(nextId,OnFocus)
end)
local function onCloseStoryMapPanel()
this.GameSetActive(nextId, OnFocus)
Game.GlobalEvent:RemoveEvent(GameEvent.GuaJi.CloseStoryMapPanel,onCloseStoryMapPanel)
end
Game.GlobalEvent:AddEvent(GameEvent.GuaJi.CloseStoryMapPanel,onCloseStoryMapPanel)
PlayerPrefs.SetInt("StoryMapPanel1"..PlayerManager.uid,0)
StoryMapManager.InitData(1)
else
@ -500,9 +502,8 @@ function this.ShowStory(nextId,OnFocus)
end
end
function this.GameSetActive(nextId,OnFocus)
function this.GameSetActive(nextId, OnFocus)
this.gameObject:SetActive(true)
Game.GlobalEvent:RemoveEvent(GameEvent.GuaJi.CloseStoryMapPanel,this.GameSetActive)
this.NextGuide(nextId)
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, OnFocus)
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, OnFocus)

View File

@ -334,7 +334,8 @@ function this:BindEvent()
--六星前往
Util.AddClick(this.btnSixStarGo,function()
PlayerManager.isSixStarJump=true
--PlayerManager.isSixStarJump=true
DynamicActivityManager.SetSelectIndex(DataType.Shop,{1107})
JumpManager.GoJump(36011)
end)

View File

@ -174,14 +174,12 @@ function EveryDayGift:RefreshGiftData(isTop,isAni)
break
end
end
if PlayerManager.isSixStarJump and curindex==0 then
curindex=7
end
-- if PlayerManager.isSixStarJump and curindex==0 then
-- curindex = 7
-- end
if curindex ~= 0 then
--LogGreen("curindex:"..curindex)
self.scrollView:SetIndex(curindex)
end
end
function EveryDayGift:isBought()

View File

@ -374,9 +374,9 @@ function SingleFightPlayerView:RoleMove(pathList)
self:SetRoleDirAction(data.u, data.v)
self.roleCurPos = data
local speed = 0.5
self.gameObject.transform:DOLocalMove(Vector3(v3.x, v3.y, v3.z - 10), speed, false):OnStart(function () end):OnUpdate(function() --TODO:测试速度
self:PlayStepSound()
self.gameObject.transform:DOLocalMove(Vector3(v3.x, v3.y, v3.z - 10), speed, false):OnStart(function () end):OnUpdate(function() --TODO:测试速度
if self.isSelf then
self:PlayStepSound()
local v4 = self.gameObject.transform.localPosition
v4.z = TileMapView.ViewCameraPos.z
TileMapView.SetCameraPos(v4)