Merge branch 'china/local' into china/test

dev_chengFeng hotfix/mht_china/xq/cdn_xq_test/0.1.66
JieLing 2021-07-31 17:44:34 +08:00
commit 0468852116
14 changed files with 476 additions and 79 deletions

View File

@ -185,13 +185,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 873960035}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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:
- {fileID: 2082006401}
m_Father: {fileID: 2857972376571971649}
m_RootOrder: 3
m_Father: {fileID: 1436239891183394945}
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}
@ -1416,11 +1416,8 @@ RectTransform:
m_Children:
- {fileID: 5676066250249380744}
- {fileID: 6672747167317814919}
- {fileID: 2737230903987393118}
- {fileID: 873960036}
- {fileID: 4106886662852041418}
- {fileID: 6937309361002804487}
- {fileID: 6746978938403573984}
- {fileID: 1436239891183394945}
- {fileID: 8356349735732826998}
m_Father: {fileID: 1295965547740137698}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1533,14 +1530,14 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 456010732934271532}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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:
- {fileID: 3408779923621903900}
- {fileID: 6714232552303648380}
m_Father: {fileID: 2857972376571971649}
m_RootOrder: 2
m_Father: {fileID: 1436239891183394945}
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}
@ -2076,6 +2073,46 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2527152010726074024
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1436239891183394945}
m_Layer: 0
m_Name: normal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1436239891183394945
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2527152010726074024}
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:
- {fileID: 2737230903987393118}
- {fileID: 873960036}
- {fileID: 4106886662852041418}
- {fileID: 6937309361002804487}
- {fileID: 6746978938403573984}
m_Father: {fileID: 2857972376571971649}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2695179168051854542
GameObject:
m_ObjectHideFlags: 0
@ -2175,13 +2212,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2711261480814228782}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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:
- {fileID: 7133322365696889359}
m_Father: {fileID: 2857972376571971649}
m_RootOrder: 5
m_Father: {fileID: 1436239891183394945}
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}
@ -2231,6 +2268,87 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5386\u53F2\u6700\u9AD8\uFF1A"
LanguageIndex: 0
--- !u!1 &2871227230248073167
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6364408976405844178}
- component: {fileID: 1256412335996617393}
- component: {fileID: 3243561346559563886}
m_Layer: 0
m_Name: Season
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6364408976405844178
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2871227230248073167}
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:
- {fileID: 5689779010244021189}
m_Father: {fileID: 8356349735732826998}
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: -196, y: 149.70001}
m_SizeDelta: {x: 343.05, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1256412335996617393
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2871227230248073167}
m_CullTransparentMesh: 0
--- !u!114 &3243561346559563886
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2871227230248073167}
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.7075472, g: 0.64001215, b: 0.56403524, a: 1}
m_RaycastTarget: 1
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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5F00\u670D\u7B2C3\u5929\u89E3\u9501"
LanguageIndex: 0
--- !u!1 &2979872552327346480
GameObject:
m_ObjectHideFlags: 0
@ -2559,12 +2677,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4096992386751104221}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 2857972376571971649}
m_RootOrder: 6
m_Father: {fileID: 1436239891183394945}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -3243,6 +3361,86 @@ MonoBehaviour:
m_EditorClassIdentifier:
bgList:
- {fileID: 3229093599019750937}
--- !u!1 &5762417203835210408
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 465233556910743428}
- component: {fileID: 1083308268956750754}
- component: {fileID: 2956255318628547991}
m_Layer: 0
m_Name: Tip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &465233556910743428
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5762417203835210408}
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: 8356349735732826998}
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: -167, y: -73}
m_SizeDelta: {x: 398.88, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1083308268956750754
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5762417203835210408}
m_CullTransparentMesh: 0
--- !u!114 &2956255318628547991
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5762417203835210408}
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: 1, g: 0.7607844, b: 0.5019608, a: 1}
m_RaycastTarget: 1
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: 0
m_MaxSize: 45
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5F00\u542F\u540E\u5343\u6218\u9010\u80DC\u53F0\u6392\u540D\u524D\n128\u540D\u7684\u73A9\u5BB6\u5C06\u81EA\u52A8\u53C2\u4E0E"
LanguageIndex: 0
--- !u!1 &6184529373675545504
GameObject:
m_ObjectHideFlags: 0
@ -3342,13 +3540,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6348000190297303489}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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:
- {fileID: 2894788629952705247}
m_Father: {fileID: 2857972376571971649}
m_RootOrder: 4
m_Father: {fileID: 1436239891183394945}
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}
@ -3398,6 +3596,123 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u6211\u7684\u6392\u540D\uFF1A"
LanguageIndex: 0
--- !u!1 &6942200164054550947
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8356349735732826998}
m_Layer: 0
m_Name: lock
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &8356349735732826998
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6942200164054550947}
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:
- {fileID: 6364408976405844178}
- {fileID: 465233556910743428}
m_Father: {fileID: 2857972376571971649}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6971458859534464137
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5689779010244021189}
- component: {fileID: 2951341077535999481}
- component: {fileID: 5060451528222810491}
m_Layer: 0
m_Name: Time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5689779010244021189
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6971458859534464137}
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: 6364408976405844178}
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: 0, y: -52.5}
m_SizeDelta: {x: 210.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2951341077535999481
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6971458859534464137}
m_CullTransparentMesh: 0
--- !u!114 &5060451528222810491
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6971458859534464137}
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.5088341, g: 0.7264151, b: 0.48998755, a: 1}
m_RaycastTarget: 1
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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 30
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\uFF08\u5269\u4F59\u65F6\u95F4\uFF1A05:02:53\uFF09"
LanguageIndex: 0
--- !u!1 &7998630011325784670
GameObject:
m_ObjectHideFlags: 0

View File

@ -2428,7 +2428,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
[15] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_PROGRESS,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 18},
[16] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 19},
[17] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = 0,RankingListMainSortId = 20},
[18] = { bgImage = "", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 21},
[18] = { bgImage = "", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 21},
[19] = { bgImage = "r_zjm_paihangbang_banner002_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 5},
[20] = { bgImage = "r_zjm_paihangbang_banner001_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_MONSTER_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 6},

View File

@ -32,6 +32,11 @@ end
-- 获取包名
function PackageManager.GetPackageID()
-- 优先使用sdk自带的
if LoginManager.SdkSubChannel then
return LoginManager.SdkSubChannel
end
-- 否则使用配置的
if this.StreamConfig then
return this.StreamConfig.PackID
end

View File

@ -247,6 +247,7 @@ FUNCTIONOFTIME_FUNCTIONID_FIELD = protobuf.FieldDescriptor();
FUNCTIONOFTIME_STARTTIME_FIELD = protobuf.FieldDescriptor();
FUNCTIONOFTIME_ENDTIME_FIELD = protobuf.FieldDescriptor();
FUNCTIONOFTIME_INTERVAL_FIELD = protobuf.FieldDescriptor();
FUNCTIONOFTIME_SWITCH_FIELD = protobuf.FieldDescriptor();
ADVENTURERANKITEMINFO = protobuf.Descriptor();
ADVENTURERANKITEMINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
ADVENTURERANKITEMINFO_NAME_FIELD = protobuf.FieldDescriptor();
@ -3032,11 +3033,21 @@ FUNCTIONOFTIME_INTERVAL_FIELD.default_value = 0
FUNCTIONOFTIME_INTERVAL_FIELD.type = 5
FUNCTIONOFTIME_INTERVAL_FIELD.cpp_type = 1
FUNCTIONOFTIME_SWITCH_FIELD.name = "switch"
FUNCTIONOFTIME_SWITCH_FIELD.full_name = ".rpc.protocols.FunctionOfTime.switch"
FUNCTIONOFTIME_SWITCH_FIELD.number = 5
FUNCTIONOFTIME_SWITCH_FIELD.index = 4
FUNCTIONOFTIME_SWITCH_FIELD.label = 1
FUNCTIONOFTIME_SWITCH_FIELD.has_default_value = false
FUNCTIONOFTIME_SWITCH_FIELD.default_value = 0
FUNCTIONOFTIME_SWITCH_FIELD.type = 5
FUNCTIONOFTIME_SWITCH_FIELD.cpp_type = 1
FUNCTIONOFTIME.name = "FunctionOfTime"
FUNCTIONOFTIME.full_name = ".rpc.protocols.FunctionOfTime"
FUNCTIONOFTIME.nested_types = {}
FUNCTIONOFTIME.enum_types = {}
FUNCTIONOFTIME.fields = {FUNCTIONOFTIME_FUNCTIONID_FIELD, FUNCTIONOFTIME_STARTTIME_FIELD, FUNCTIONOFTIME_ENDTIME_FIELD, FUNCTIONOFTIME_INTERVAL_FIELD}
FUNCTIONOFTIME.fields = {FUNCTIONOFTIME_FUNCTIONID_FIELD, FUNCTIONOFTIME_STARTTIME_FIELD, FUNCTIONOFTIME_ENDTIME_FIELD, FUNCTIONOFTIME_INTERVAL_FIELD, FUNCTIONOFTIME_SWITCH_FIELD}
FUNCTIONOFTIME.is_extendable = false
FUNCTIONOFTIME.extensions = {}
ADVENTURERANKITEMINFO_LEVEL_FIELD.name = "level"

View File

@ -17,12 +17,18 @@ function ArenaTypePanel:InitComponent()
this.Arena_Score = Util.GetGameObject(this.btnArena, "Score/Text"):GetComponent("Text")
this.Arena_Rank = Util.GetGameObject(this.btnArena, "Rank/Text"):GetComponent("Text")
this.TopMatch_Normal = Util.GetGameObject(this.btnTopMatch, "normal")
this.TopMatch_Name = Util.GetGameObject(this.btnTopMatch, "Name"):GetComponent("Text")
this.TopMatch_Season = Util.GetGameObject(this.btnTopMatch, "Season/Text"):GetComponent("Text")
this.TopMatch_SeasonTime = Util.GetGameObject(this.btnTopMatch, "Season/Time"):GetComponent("Text")
this.TopMatch_Stage = Util.GetGameObject(this.btnTopMatch, "Stage/Text"):GetComponent("Text")
this.TopMatch_Rank = Util.GetGameObject(this.btnTopMatch, "MyRank/Text"):GetComponent("Text")
this.TopMatch_BestRank = Util.GetGameObject(this.btnTopMatch, "BestRank/Text"):GetComponent("Text")
this.TopMatch_Season = Util.GetGameObject(this.TopMatch_Normal, "Season/Text"):GetComponent("Text")
this.TopMatch_SeasonTime = Util.GetGameObject(this.TopMatch_Normal, "Season/Time"):GetComponent("Text")
this.TopMatch_Stage = Util.GetGameObject(this.TopMatch_Normal, "Stage/Text"):GetComponent("Text")
this.TopMatch_Rank = Util.GetGameObject(this.TopMatch_Normal, "MyRank/Text"):GetComponent("Text")
this.TopMatch_BestRank = Util.GetGameObject(this.TopMatch_Normal, "BestRank/Text"):GetComponent("Text")
this.TopMatch_Lock = Util.GetGameObject(this.btnTopMatch, "lock")
this.TopMatch_Lock_Title = Util.GetGameObject(this.TopMatch_Lock, "Season"):GetComponent("Text")
this.TopMatch_Lock_Time = Util.GetGameObject(this.TopMatch_Lock, "Season/Time"):GetComponent("Text")
this.TopMatch_Lock_Tip = Util.GetGameObject(this.TopMatch_Lock, "Tip"):GetComponent("Text")
this.btnArenaRedpot = Util.GetGameObject(this.btnArena, "bg/redpot")
-- 上部货币显示
@ -43,8 +49,8 @@ function ArenaTypePanel:BindEvent()
--end
--JumpManager.GoJump(57001)
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TOP_MATCH)
if not serData then
local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH)
if not isOpen then
PopupTipPanel.ShowTip("巅峰赛暂未开放")
return
end
@ -61,22 +67,22 @@ end
--添加事件监听(用于子类重写)
function ArenaTypePanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshTopMatchShow)
Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnOpen, this)
Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.OnOpen, this)
Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnShow, this)
Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.OnShow, this)
end
--移除事件监听(用于子类重写)
function ArenaTypePanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshTopMatchShow)
Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnOpen, this)
Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.OnOpen, this)
Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnShow, this)
Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.OnShow, this)
end
--界面打开时调用(用于子类重写)
function ArenaTypePanel:OnOpen(...)
-- SoundManager.PlayMusic(SoundConfig.BGM_Arena)
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TOP_MATCH)
if serData then
local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH)
if isOpen then
FormationManager.GetFormationByID(FormationTypeDef.ARENA_TOM_MATCH)
end
end
@ -120,21 +126,34 @@ end
-- 刷新巅峰战显示
function this.RefreshTopMatchShow()
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TOP_MATCH)
if serData then
local startDate = os.date("%m.%d", serData.startTime)
local endDate = os.date("%m.%d", serData.endTime)
this.TopMatch_Season.text = string.format("%s-%s", startDate, endDate)
local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH)
if isOpen then
this.TopMatch_Normal:SetActive(true)
this.TopMatch_Lock:SetActive(false)
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TOP_MATCH)
if serData then
local startDate = os.date("%m.%d", serData.startTime)
local endDate = os.date("%m.%d", serData.endTime)
this.TopMatch_Season.text = string.format("%s-%s", startDate, endDate)
else
this.TopMatch_Season.text = "暂未开放"
end
local tmData = ArenaTopMatchManager.GetBaseData()
local titleName, stageName = ArenaTopMatchManager.GetCurTopMatchName()
this.TopMatch_Name.text = titleName
this.TopMatch_Stage.text = stageName
this.TopMatch_Rank.text = tmData.myrank <= 0 and Language[10036] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank)
this.TopMatch_BestRank.text = tmData.maxRank <= 0 and Language[10086] or this.GetRankName(tmData.maxRank)
else
this.TopMatch_Season.text = "暂未开放"
end
this.TopMatch_Normal:SetActive(false)
this.TopMatch_Lock:SetActive(true)
local tmData = ArenaTopMatchManager.GetBaseData()
local titleName, stageName = ArenaTopMatchManager.GetCurTopMatchName()
this.TopMatch_Name.text = titleName
this.TopMatch_Stage.text = stageName
this.TopMatch_Rank.text = tmData.myrank <= 0 and Language[10036] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank)
this.TopMatch_BestRank.text = tmData.maxRank <= 0 and Language[10086] or this.GetRankName(tmData.maxRank)
local titleName, stageName = ArenaTopMatchManager.GetCurTopMatchName()
this.TopMatch_Name.text = titleName
this.TopMatch_Lock_Title.text = string.format("%s解锁", ActTimeCtrlManager.GetSwitchOpenTip(FUNCTION_OPEN_TYPE.TOP_MATCH))
end
end
@ -165,26 +184,37 @@ function this.TimeUpdate()
end
this.Arena_SeasonTime.text = string.format(Language[10090], TimeToHMS(leftTime))
local isActive = ArenaTopMatchManager.IsTopMatchActive()
local startTime, endTime = ArenaTopMatchManager.GetTopMatchTime()
if isActive then
local leftTime = endTime - GetTimeStamp()
if leftTime <= 0 then
this.RefreshTopMatchShow()
end
this.TopMatch_SeasonTime.text = string.format(Language[10090], TimeToHMS(leftTime))
else
if startTime then
local leftTime = startTime - GetTimeStamp()
local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH)
if isOpen then
local isActive = ArenaTopMatchManager.IsTopMatchActive()
local startTime, endTime = ArenaTopMatchManager.GetTopMatchTime()
if isActive then
local leftTime = endTime - GetTimeStamp()
if leftTime <= 0 then
this.RefreshTopMatchShow()
this.TopMatch_SeasonTime.text = ""
else
this.TopMatch_SeasonTime.text = string.format(Language[10091], TimeToHMS(leftTime))
end
this.TopMatch_SeasonTime.text = string.format(Language[10090], TimeToHMS(leftTime))
else
this.RefreshTopMatchShow()
this.TopMatch_SeasonTime.text = ""
if startTime then
local leftTime = startTime - GetTimeStamp()
if leftTime <= 0 then
this.RefreshTopMatchShow()
this.TopMatch_SeasonTime.text = ""
else
this.TopMatch_SeasonTime.text = string.format(Language[10091], TimeToHMS(leftTime))
end
else
this.RefreshTopMatchShow()
this.TopMatch_SeasonTime.text = ""
end
end
else
local startTime, endTime = ArenaTopMatchManager.GetTopMatchTime()
if startTime then
local leftTime = startTime - GetTimeStamp()
this.TopMatch_Lock_Time.text = string.format("(即将解锁:%s", TimeToHMS(leftTime))
else
this.TopMatch_Lock_Time.text = ""
end
end
end

View File

@ -190,14 +190,14 @@ function this.TabIsLockCheck(index)
if channel == CHAT_CHANNEL.FAMILY then
local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GUILD)
if not isOpen then
return true, Language[10369]
return true, ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.GUILD)
end
if isOpen and PlayerManager.familyId == 0 then
return true, Language[10370]
end
elseif channel == CHAT_CHANNEL.JUMP_SERVER then
if PlayerManager.isCross == 0 then
return true, "跨服频道暂未开启"
return true, "未划分跨服分组"
end
end
return false

View File

@ -98,6 +98,7 @@ function this.InitMsg(msg)
local startTime = t.startTime
local endTime = t.endTime
local restTime = t.interval
local switch = t.switch
this.serData[id] = {}
@ -105,10 +106,11 @@ function this.InitMsg(msg)
this.serData[id].startTime = startTime
this.serData[id].endTime = endTime
this.serData[id].restTime = restTime
this.serData[id].switch = switch
-- Log(
-- string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s",
-- id, startTime, endTime))
Log(
string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s, switch = %s",
id, startTime, endTime, switch))
-- 用于标记是否解锁使用
local typeId = AllActSetConfig[id].IsIDdSame
@ -272,8 +274,9 @@ end
function this.SingleFuncState(id)
local isOpen = false
local qualifiled = this.IsQualifiled(id)
local isOpen = this.IsSwitchOpen(id)
local isActive = this.FuncTimeJudge(id)
if qualifiled and isActive then
if isOpen and qualifiled and isActive then
isOpen = true
else
isOpen = false
@ -322,6 +325,30 @@ function this.IsQualifiled(id)
return qualifiled
end
-- 判断功能是否真的开放
function this.IsSwitchOpen(id)
local serData = this.GetSerDataByTypeId(id)
if serData then
return serData.switch == 0
end
return false
end
--
local SwitchOpenStr = {
[1] = "创角第%s天",
[2] = "开服第%s天"
}
function this.GetSwitchOpenTip(id)
local data = this.GetTableDataByTypeId(id)[1]
if data then
if data.IfOpen then
local t = data.IfOpen[1]
return string.format(SwitchOpenStr[t], data.IfOpen[2])
end
end
return
end
--传入需要锁上的功能, state 为true需要置灰
function this.SetFuncLockState(obj, id, state,isWorkShop)
local isOpen = this.SingleFuncState(id)

View File

@ -1,4 +1,4 @@
LoginManager = {};
LoginManager = {};
local this = LoginManager
this.sign = "d13b3e8ef74bf72d8aafce3a1c8672a0"
this.openId = nil
@ -44,6 +44,7 @@ function this.Initialize()
AppConst.SdkChannel = result[5] or ""
this.extData = result[6] or ""
this.p_appId = result[7] or ""
this.SdkSubChannel = result[8]
AppConst.SdkPackageName = AndroidDeviceInfo.Instance:GetPackageName()
end
-- 判断是否是注册并登录
@ -102,7 +103,8 @@ function this.TrackCreateAccount()
account = AppConst.isSDK and tostring(AppConst.OpenId) or "",
Bundle_id = AppConst.isSDK and AppConst.SdkPackageName or "",
xx_id = AppConst.isSDK and AppConst.SdkChannel or "",
device_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDeviceId() or ""
device_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDeviceId() or "",
packId = PackageManager.GetPackageID() or "",
})
ThinkingAnalyticsManager.Track("create_account")
end

View File

@ -356,7 +356,7 @@ function this.RequestServerVersion(func)
func()
end
end, nil, nil, function(errCode, errMsg)
LogError("GetServerVersion Error: "..errCode .. ", "..errMsg)
LogError("GetServerVersion Error: "..tostring(errCode) .. ", "..tostring(errMsg))
if func then
func()
end

View File

@ -504,7 +504,7 @@ function this:BindEvent()
local types = {}
local activiteIds = {}
for i = 1, #rankKingList do
if rankKingList[i].isRankingMainPanelShow > 0 then
if rankKingList[i].isRankingMainPanelShow == 1 or rankKingList[i].isRankingMainPanelShow == 2 then
table.insert(types,rankKingList[i].rankType)
table.insert(activiteIds,rankKingList[i].activiteId)
end
@ -1684,6 +1684,7 @@ function this.RefreshBattleUpLvTip()
end
local roleRefreshNum = 0
function this.OnMainPlayerNPCRefresh()
-- Log("roleRefreshNum asd ")
if roleRefreshNum < 20 then
roleRefreshNum = roleRefreshNum + 1
-- LogRed("roleRefreshNum "..roleRefreshNum)

View File

@ -301,8 +301,11 @@ end
function this.TrialRedCheck()
local text =PlayerManager.uid.."TrialReset"
local cTime = GetTimeStamp()
local freshTime = ActTimeCtrlManager.GetSerDataByTypeId(30).endTime
local sdata = ActTimeCtrlManager.GetSerDataByTypeId(30)
if not sdata then
return false
end
local freshTime = sdata.endTime
if not PlayerPrefs.HasKey(text) then
PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗每两天五点刷新重置红点
PlayerPrefs.SetInt(text,freshTime)

View File

@ -46,7 +46,8 @@ function this.LoginRequest(openId, func)
data.distinct_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDistinctId() or ""
data.openId = openId
data.cc_id = PackageManager.GetCCCode()
data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid
local packId = PackageManager.GetPackageID() or ""
data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName .."#".. packId or "" --pt_pid.."#"..pt_gid
data.platform_s = AppConst.Platform --and "ADR" or "PC"
local msg = data:SerializeToString()
@ -73,6 +74,7 @@ function this.LoginRequest(openId, func)
account = AppConst.isSDK and tostring(AppConst.OpenId) or "",
Bundle_id = AppConst.isSDK and AppConst.SdkPackageName or "",
xx_id = AppConst.isSDK and AppConst.SdkChannel or "",
packId = PackageManager.GetPackageID() or "",
-- test_list = "1,2,3#2", -- 数组
})
TapDBManager.SetServer(LoginManager.ServerId)

View File

@ -23,7 +23,7 @@ function this.InitData(rankType,fun,id,rankIndex)
local isCross = 0
for i = 1, #rankKingList do
if rankType == rankKingList[i].rankType then
if rankKingList[i].isRankingMainPanelShow == 2 then
if rankKingList[i].isRankingMainPanelShow >= 2 then
isCross = 1
end
end
@ -46,7 +46,7 @@ function this.RequestNextWarPowerPageData(fun)
--LogGreen(Language[12215])
return
end
Log("cur_rankIndex "..cur_rankIndex)
-- Log("cur_rankIndex "..cur_rankIndex)
NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据
this.ReceiveNextRankingData(msg,fun)
end,cur_activiteId,cur_rankIndex)

View File

@ -380,6 +380,7 @@ namespace GameEditor.FrameTool
new string[]{ "灵动-商务", "mht_china/sw", "cdn_mht_sw", "china/mht_sw" },
new string[]{ "先遣-内网", "mht_china/local", "local12_cn_local", "china/local" },
new string[]{ "先遣-测试跨服", "mht_china/kf", "cdn_xq_kf", "china/local" },
new string[]{ "先遣-测试", "mht_china/xq", "cdn_xq_test", "china/test" },
new string[]{ "先遣-正式", "mht_china/xq", "cdn_xq_release", "china/test" },