Merge branch 'fang/victory_anim' into dev
This commit is contained in:
commit
8dbaaf8dc9
@ -80,9 +80,9 @@ function MaincityManager:getModuleInSideBarWhere(moduleKey)
|
|||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.mainCityUI:isInSideBarLeft(moduleKey) then
|
if mainUI:isInSideBarLeft(moduleKey) then
|
||||||
return -1
|
return -1
|
||||||
elseif self.mainCityUI:isInSideBarRight(moduleKey) then
|
elseif mainUI:isInSideBarRight(moduleKey) then
|
||||||
return 1
|
return 1
|
||||||
else
|
else
|
||||||
return 0
|
return 0
|
||||||
@ -95,7 +95,7 @@ function MaincityManager:isActivSideBarModule(moduleKey)
|
|||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
return self.mainCityUI:isActivSideBarModule(moduleKey)
|
return mainUI:isActivSideBarModule(moduleKey)
|
||||||
end
|
end
|
||||||
|
|
||||||
return MaincityManager
|
return MaincityManager
|
||||||
Loading…
x
Reference in New Issue
Block a user