Merge branch 'master_tishen_hw' of http://60.1.1.230/gaoxin/JL_Client into master_tishen_hw
commit
797b69e98d
|
@ -309,7 +309,7 @@ MonoBehaviour:
|
|||
enableLog: 1
|
||||
networkType: 3
|
||||
tokens:
|
||||
- appid: debug-appid
|
||||
- appid: a74fa0e580424c67ab8e7c9d8deb1461
|
||||
serverUrl: http://thinkingdata.18183g.com
|
||||
mode: 1
|
||||
timeZone: 0
|
||||
|
@ -345,7 +345,8 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
appid: wjtsq7xrwb48t2uw
|
||||
appid: b9hrb9imz2ztwbjx
|
||||
channel: "TCX-\u65B0\u9A6C\u6FB3-GP\u6D4B\u8BD5\u5305"
|
||||
--- !u!114 &3471622135844523396
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -358,4 +359,4 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
appid:
|
||||
appid: f5ea84ab77
|
||||
|
|
|
@ -53,7 +53,7 @@ namespace GameLogic
|
|||
/// <summary>
|
||||
/// 析构函数
|
||||
/// </summary>
|
||||
new void OnDestroy()
|
||||
void OnDestroy()
|
||||
{
|
||||
Reset();
|
||||
}
|
||||
|
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/audio/skill/actor_voc/audio_battle_vo_jhsn01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/audio/skill/actor_voc/audio_battle_vo_mjn01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/audio/skill/actor_voc/audio_battle_vo_pxps01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_axl_00061_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_dz_00058_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_gyps_00020_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_hdxj_00066_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_jhsn_00068_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_jll_00059_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_jlzz_00060_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_jy_00055_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_lsx_00069_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_md_00064_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_mjn_00063_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_mz_00062_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_nxq_00054_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_sdxj_00067_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_ygl_00056_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_yhj_00057_t9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/fonts/artfont_3
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -54966,7 +54966,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
@ -101993,7 +101993,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
@ -122258,12 +122258,12 @@ GameObject:
|
|||
- component: {fileID: 8372953808703828970}
|
||||
- component: {fileID: 4701517501157699323}
|
||||
m_Layer: 5
|
||||
m_Name: btn
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &876998903884338440
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -122280,8 +122280,8 @@ RectTransform:
|
|||
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: 4.3, y: 4.7}
|
||||
m_SizeDelta: {x: 142, y: 141.8}
|
||||
m_AnchoredPosition: {x: 45.3, y: 45.7}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8372953808703828970
|
||||
CanvasRenderer:
|
||||
|
@ -122304,14 +122304,14 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_RaycastTarget: 1
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -122381,7 +122381,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
|
|
@ -5081,9 +5081,9 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 316.40005, y: -73.150055}
|
||||
m_AnchoredPosition: {x: 0.000057485686, y: -73.150055}
|
||||
m_SizeDelta: {x: 0, y: 151}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &5729675956691850897
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -19668,9 +19668,9 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 316.40002, y: -73.150055}
|
||||
m_AnchoredPosition: {x: 0.000028742843, y: -73.150055}
|
||||
m_SizeDelta: {x: 0, y: 151}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &4796361513380277662
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -43979,80 +43979,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6406938328886149404
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3122847029739947333}
|
||||
- component: {fileID: 9172115513959909474}
|
||||
- component: {fileID: 6269553500272781496}
|
||||
m_Layer: 0
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3122847029739947333
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6406938328886149404}
|
||||
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: 2931217454655974565}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9172115513959909474
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6406938328886149404}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6269553500272781496
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6406938328886149404}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.8}
|
||||
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_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6801484805305654314
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -2185,7 +2185,7 @@ MonoBehaviour:
|
|||
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_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
|
|
@ -592,6 +592,7 @@ RedPointType = {
|
|||
LegendExplore = 118, --车迟斗法副本
|
||||
EndLess = 119,--无尽副本
|
||||
Trial = 121,--森罗幻境
|
||||
TrialReward = 1211,--森罗任务
|
||||
-- 充值
|
||||
Recharge = 120,
|
||||
|
||||
|
|
|
@ -227,6 +227,7 @@ end
|
|||
--一种装备一种装备的循环检测 金币能合成的数量 与 背包装备能合成的数量 取最小值 然后扣除临时消耗道具
|
||||
--最后所有装备存在curPosEquips 与 之前背包 bagPosEquips 作比较 看合成了什么装备 删除了什么装备 和计算消耗材料
|
||||
function this.AutoCompound(_position)
|
||||
local goldIsEnough = true
|
||||
--表数据
|
||||
local curPosEquips = EquipTreasureManager.GetAllTabletTreasuresByRaceAndType(_position)--,curSelectEquip.equipType)
|
||||
--实际数据
|
||||
|
@ -304,6 +305,8 @@ function this.AutoCompound(_position)
|
|||
--LogGreen("合成curPosEquipsData[equipData.equipType][equipData.quantity]之后:"..curPosEquipsData[equipData.equipType][equipData.quantity])
|
||||
end
|
||||
end
|
||||
else
|
||||
goldIsEnough = false
|
||||
end
|
||||
end
|
||||
local origiData = EquipTreasureManager.GeEquipTreasureDatas(_position)
|
||||
|
@ -313,12 +316,16 @@ function this.AutoCompound(_position)
|
|||
--LogGreen("m:"..m.." origiData[i][n]:"..origiData[i][n])
|
||||
if m > origiData[i][n] then
|
||||
local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelConfig,"Location",i,"Level",n,"Race",_position)
|
||||
local num = m - origiData[i][n]
|
||||
--LogGreen("config.id:"..config.Id.." num:"..m - origiData[i][n])
|
||||
table.insert(endReward,{config.Id,m - origiData[i][n]})
|
||||
table.insert(endReward,{config.Id,num})
|
||||
end
|
||||
end
|
||||
end
|
||||
if LengthOfTable(endReward) < 1 then
|
||||
if not goldIsEnough and LengthOfTable(endReward) < 1 then
|
||||
PopupTipPanel.ShowTip("金币不足,无法合成")
|
||||
return
|
||||
elseif LengthOfTable(endReward) < 1 then
|
||||
PopupTipPanel.ShowTip(Language[12258])
|
||||
return
|
||||
end
|
||||
|
|
|
@ -1411,7 +1411,7 @@ function this.TimeFormat()
|
|||
local startTime = ArenaTopMatchManager.GetTopMatchTime()
|
||||
local tempTime = startTime - PlayerManager.serverTime
|
||||
-- 当日五点开始显示
|
||||
if tempTime < 16 * 60 * 60 then
|
||||
if tempTime > 0 and tempTime < 16 * 60 * 60 then
|
||||
SetTopMatchActive(true)
|
||||
this.topMatchTime.text = "距开始\n"..TimeToHMS(tempTime)
|
||||
else
|
||||
|
|
|
@ -206,6 +206,20 @@ function this.GetTrialRewardState(id)
|
|||
return 1
|
||||
end
|
||||
end
|
||||
--任务红点检测
|
||||
function this.TrialRewardRedPointCheck()
|
||||
local d={}
|
||||
for _, configInfo in ConfigPairs(trialKillConfig) do
|
||||
table.insert(d, configInfo)
|
||||
end
|
||||
for i = 1, #d do
|
||||
local state = MapTrialManager.GetTrialRewardState(d[i].Id)
|
||||
if state == 1 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
--设置试练奖励信息
|
||||
function this.SetTrialRewardInfo(v)
|
||||
|
@ -222,6 +236,7 @@ end
|
|||
|
||||
--设置试练已杀小怪数量
|
||||
function this.SetKillCount(v)
|
||||
CheckRedPointStatus(RedPointType.TrialReward)
|
||||
this.killCount=v
|
||||
end
|
||||
--获取已杀小怪数量
|
||||
|
|
|
@ -70,6 +70,9 @@ function TrialMapPanel:InitComponent(root, mapPanel)
|
|||
--boss召唤特效
|
||||
this.bossEffect = Util.GetGameObject(root, "UI_effect_shilian_tab")
|
||||
this.energyRoot = Util.GetGameObject(root, "stepROot")
|
||||
|
||||
this.rewardRedPoint = Util.GetGameObject(root,"leftCenter/btnReward/redPoint")
|
||||
BindRedPointObject(RedPointType.TrialReward, this.rewardRedPoint)
|
||||
end
|
||||
|
||||
|
||||
|
@ -461,6 +464,7 @@ function TrialMapPanel:OnClose()
|
|||
end
|
||||
|
||||
function TrialMapPanel:OnDestroy()
|
||||
ClearRedPointObject(RedPointType.TrialReward)
|
||||
SubUIManager.Close(this.upView)
|
||||
heroList={}
|
||||
end
|
||||
|
|
|
@ -44,7 +44,7 @@ function this.LoginRequest(openId, func)
|
|||
data.distinct_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDistinctId() or ""
|
||||
data.openId = openId
|
||||
data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid
|
||||
data.platform_s = AppConst.isSDK and "ADR" or "PC"
|
||||
data.platform_s = AppConst.Platform --and "ADR" or "PC"
|
||||
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.LOGIN_REQUEST, MessageTypeProto_pb.LOGIN_RESPONSE, msg, function(buffer)
|
||||
|
|
|
@ -201,6 +201,8 @@ end
|
|||
|
||||
function this.GetGrowthRedPointState()
|
||||
local redPoint = false
|
||||
local hasGift = OperatingManager.HasGoodsByShowType(4)
|
||||
if not hasGift then return false end
|
||||
local giftGoodsInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward)
|
||||
if giftGoodsInfo then return false end
|
||||
local openId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)
|
||||
|
|
|
@ -215,12 +215,15 @@ function OperatingPanel:RefreshTabStatus()
|
|||
--判断成长基金活动是否开启或结束(16是最后一档活动ActivityId)
|
||||
local t2 = false
|
||||
local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)
|
||||
local singleRewardData
|
||||
if GrowthRewardId then--是否开启
|
||||
t2 = true
|
||||
end
|
||||
if GrowthRewardId == 16 then--是否结束
|
||||
singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324)
|
||||
local hasGift = OperatingManager.HasGoodsByShowType(4)
|
||||
if t2 and not hasGift then
|
||||
t2 = false
|
||||
end
|
||||
if t2 and GrowthRewardId == 16 then--是否结束
|
||||
local singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324)
|
||||
if not singleRewardData then
|
||||
t2 = false
|
||||
else
|
||||
|
|
|
@ -107,6 +107,7 @@ function this.InitRedPointAllRelate()
|
|||
|
||||
RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane)
|
||||
RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane)
|
||||
RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial)
|
||||
RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane)
|
||||
|
||||
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)
|
||||
|
@ -245,7 +246,7 @@ function this.InitRedPointAllRelate()
|
|||
-- 成就
|
||||
RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain)
|
||||
--大闹天宫 天宫秘宝
|
||||
RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.Expedition)
|
||||
RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.OrdinaryExplore)
|
||||
end
|
||||
|
||||
-- 注册红点检测方法
|
||||
|
@ -395,13 +396,14 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
|
||||
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.EXPEDITION)
|
||||
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)
|
||||
RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING)
|
||||
RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY)
|
||||
|
||||
--万象境副本
|
||||
RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Trial, MapTrialManager.TrialRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.TrialReward, MapTrialManager.TrialRewardRedPointCheck)
|
||||
RPData:AddCheckFunc(RedPointType.EndLess, EndLessMapManager.EndlessRedCheck)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot)
|
||||
|
|
|
@ -108,6 +108,7 @@ function this.SetScrollPre(root,data)
|
|||
mask:SetActive(true)
|
||||
getBtn:SetActive(false)
|
||||
this.RefreshPanel()
|
||||
CheckRedPointStatus(RedPointType.TrialReward)
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
|
|
|
@ -90,6 +90,7 @@ function this:RemoveListener()
|
|||
end
|
||||
|
||||
function this:OnShow(_parent,...)
|
||||
oldChoosed = nil
|
||||
parent=_parent
|
||||
sortingOrder = _parent.sortingOrder
|
||||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||
|
@ -142,8 +143,9 @@ function this.RefreshPanel()
|
|||
hpExp.value=v.heroHp/10000
|
||||
Util.SetGray(o,v.heroHp<=0)
|
||||
|
||||
choosed:SetActive(i==1)
|
||||
if i==1 then
|
||||
choosed:SetActive(false)
|
||||
if MapTrialManager.selectHeroDid == v.heroId then
|
||||
choosed:SetActive(true)
|
||||
oldChoosed=choosed
|
||||
selectHeroDid=v.heroId
|
||||
end
|
||||
|
|
|
@ -468,7 +468,7 @@ function this.NextCurEquipData()
|
|||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function RoleEquipChangePopup:OnClose()
|
||||
|
||||
nextSuitProGo = {}
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
|
|
@ -94,6 +94,7 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId)
|
|||
this.shopType = shopType
|
||||
this.shopItemId = shopItemId
|
||||
this.shopItemInfo = ShopManager.GetShopItemInfo(shopItemId)
|
||||
LogGreen(shopItemId..":shopItemId")
|
||||
this.shopItemData = ShopManager.GetShopItemData(shopType, shopItemId)
|
||||
|
||||
-- 商品基础信息显示
|
||||
|
@ -104,7 +105,14 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId)
|
|||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
this.itemContent.text = string.gsub(itemConfig[goodsId].ItemDescribe, "\\n", "\n")
|
||||
this.itemIcon.sprite = SetIcon(goodsId)
|
||||
this.itemBg.sprite = SetFrame(goodsId)
|
||||
if itemConfig[this.shopItemInfo.Goods[1][1]].ItemType == 2 then
|
||||
this.itemBg.sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[this.shopItemInfo.Goods[1][1]].Quantity))
|
||||
Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(true)
|
||||
Util.GetGameObject(self.gameObject, "tipImage/item/proima"):GetComponent("Image").sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(itemConfig[this.shopItemInfo.Goods[1][1]].PropertyName))
|
||||
else
|
||||
this.itemBg.sprite = SetFrame(goodsId)
|
||||
Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(false)
|
||||
end
|
||||
this.itemNum.text = this.goods[1][2]
|
||||
-- 计算最大可购买的数量
|
||||
local countLimitNum = ShopManager.GetShopItemLimitBuyCount(shopItemId)
|
||||
|
|
|
@ -13,7 +13,7 @@ PlayerSettings:
|
|||
useOnDemandResources: 0
|
||||
accelerometerFrequency: 60
|
||||
companyName: Test
|
||||
productName: "\u5185\u7F51\u6D4B\u8BD5\u5305"
|
||||
productName: "\u592A\u521D\u884C"
|
||||
defaultCursor: {fileID: 0}
|
||||
cursorHotspot: {x: 0, y: 0}
|
||||
m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
|
@ -155,7 +155,7 @@ PlayerSettings:
|
|||
androidSupportedAspectRatio: 1
|
||||
androidMaxAspectRatio: 2.1
|
||||
applicationIdentifier:
|
||||
Android: com.mht.tcxcsb.project
|
||||
Android: com.tcxazcsb.pass
|
||||
Standalone: com.doudou.dwc
|
||||
Tizen: com.junfine.luaframework
|
||||
iOS: com.doudou.dwc
|
||||
|
@ -248,11 +248,11 @@ PlayerSettings:
|
|||
clonedFromGUID: 00000000000000000000000000000000
|
||||
templatePackageId:
|
||||
templateDefaultScene:
|
||||
AndroidTargetArchitectures: 1
|
||||
AndroidTargetArchitectures: 5
|
||||
AndroidSplashScreenScale: 2
|
||||
androidSplashScreen: {fileID: 0}
|
||||
AndroidKeystoreName:
|
||||
AndroidKeyaliasName:
|
||||
AndroidKeystoreName: E:/Git/mht_haiwai_chubaozipTest/mhthw_test.keystore
|
||||
AndroidKeyaliasName: mhthwtest
|
||||
AndroidBuildApkPerCpuArchitecture: 0
|
||||
AndroidTVCompatibility: 0
|
||||
AndroidIsGame: 1
|
||||
|
|
Loading…
Reference in New Issue