Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
4b05af8b04
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 165 KiB |
|
@ -69,6 +69,39 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 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
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 58
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
@ -80,7 +113,7 @@ TextureImporter:
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
spritePackingTag: SupremeHeroAtlas
|
spritePackingTag:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
Before Width: | Height: | Size: 362 KiB After Width: | Height: | Size: 362 KiB |
|
@ -69,6 +69,39 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 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
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 58
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
@ -80,7 +113,7 @@ TextureImporter:
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
spritePackingTag: FirstRechargeAtlas
|
spritePackingTag:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
|
@ -73,7 +73,7 @@ TextureImporter:
|
||||||
buildTarget: iPhone
|
buildTarget: iPhone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
textureFormat: 65
|
textureFormat: 58
|
||||||
textureCompression: 1
|
textureCompression: 1
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
crunchedCompression: 0
|
crunchedCompression: 0
|
||||||
|
@ -102,7 +102,7 @@ TextureImporter:
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
spritePackingTag: FirstRechargeAtlas
|
spritePackingTag:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
|
@ -207029,7 +207029,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: bcb2c58100219d844997cd13b1b70c6b, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 966519e07bf63854a948ea52175781b5, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
|
@ -39,6 +39,21 @@ local TabToContent = {
|
||||||
[12] = 5,
|
[12] = 5,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local TabImageConfig = {
|
||||||
|
[1] = {normal = "r_meiriqiandao_anniu_01_zh", select = "r_meiriqiandao_anniu_zh"},
|
||||||
|
[2] = {normal = "c_chengzhang_yueka002_zh", select = "c_chengzhang_yueka001_zh"},
|
||||||
|
[3] = {normal = "c_czjj_icon2_zh", select = "c_czjj_icon1_zh"},
|
||||||
|
[4] = {normal = "r_jitianhaoli_anniu_01_zh", select = "r_jitianhaoli_anniu_zh"},
|
||||||
|
[5] = {normal = "m_meizhoulibao_icon2_zh", select = "m_meizhoulibao_icon1_zh"},
|
||||||
|
[6] = {normal = "m_meiyuelibao_icon2_zh", select = "m_meiyuelibao_icon1_zh"},
|
||||||
|
[7] = {normal = "y_yjj_128yjj001_zh", select = "y_yjj_128yjj002_zh"},
|
||||||
|
[8] = {normal = "y_yjj_328yjj002_zh", select = "y_yjj_328yjj001_zh"},
|
||||||
|
[9] = {normal = "r_guanzhuyouli_anniu_01_zh", select = "r_guanzhuyouli_anniu_zh"},
|
||||||
|
[10] = {normal = "z_zhenqibaoge_anniu_02_zh", select = "z_zhenqibaoge_anniu_01_zh"},
|
||||||
|
[11] = {normal = "s_shengxingyouli_anniu_02_zh", select = "s_shengxingyouli_anniu_01_zh"},
|
||||||
|
[12] = {normal = "r_huodong_leijichengzhianniu_01_zh", select = "r_huodong_leijichengzhianniu_zh"},
|
||||||
|
}
|
||||||
|
|
||||||
local kMaxTab = #TabToContent
|
local kMaxTab = #TabToContent
|
||||||
|
|
||||||
function OperatingPanel:InitComponent()
|
function OperatingPanel:InitComponent()
|
||||||
|
@ -49,7 +64,9 @@ function OperatingPanel:InitComponent()
|
||||||
self.selectTabs = {}
|
self.selectTabs = {}
|
||||||
for i = 1, kMaxTab do
|
for i = 1, kMaxTab do
|
||||||
self.operateTabs[i] = Util.GetGameObject(self.tabsContent.transform, "tabs_" .. i)
|
self.operateTabs[i] = Util.GetGameObject(self.tabsContent.transform, "tabs_" .. i)
|
||||||
|
self.operateTabs[i]:GetComponent("Image").sprite = Util.LoadSprite(TabImageConfig[i].normal)
|
||||||
self.selectTabs[i] = Util.GetGameObject(self.operateTabs[i], "selected")
|
self.selectTabs[i] = Util.GetGameObject(self.operateTabs[i], "selected")
|
||||||
|
self.selectTabs[i]:GetComponent("Image").sprite = Util.LoadSprite(TabImageConfig[i].select)
|
||||||
end
|
end
|
||||||
self.selectTabIndex = -1
|
self.selectTabIndex = -1
|
||||||
self.operatingContents = {
|
self.operatingContents = {
|
||||||
|
|
Loading…
Reference in New Issue