Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
830f7d3dd9
|
|
@ -0,0 +1,362 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!29 &1
|
||||
OcclusionCullingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_OcclusionBakeSettings:
|
||||
smallestOccluder: 5
|
||||
smallestHole: 0.25
|
||||
backfaceThreshold: 100
|
||||
m_SceneGUID: 00000000000000000000000000000000
|
||||
m_OcclusionCullingData: {fileID: 0}
|
||||
--- !u!1 &2
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 16}
|
||||
- component: {fileID: 42}
|
||||
- component: {fileID: 44}
|
||||
- component: {fileID: 43}
|
||||
- component: {fileID: 5}
|
||||
- component: {fileID: 3}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c7cbe2940276bfc4f946d442c07229d2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_BuildSettings:
|
||||
serializedVersion: 2
|
||||
agentTypeID: 0
|
||||
agentRadius: 0.5
|
||||
agentHeight: 2
|
||||
agentSlope: 45
|
||||
agentClimb: 0.4
|
||||
ledgeDropHeight: 0
|
||||
maxJumpAcrossDistance: 0
|
||||
minRegionArea: 2
|
||||
manualCellSize: 0
|
||||
cellSize: 0.16666667
|
||||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!81 &5
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
--- !u!4 &16
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
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: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!104 &22
|
||||
RenderSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
m_Fog: 0
|
||||
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
m_FogMode: 3
|
||||
m_FogDensity: 0.01
|
||||
m_LinearFogStart: 0
|
||||
m_LinearFogEnd: 300
|
||||
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
||||
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 3
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
m_HaloTexture: {fileID: 0}
|
||||
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_DefaultReflectionMode: 0
|
||||
m_DefaultReflectionResolution: 128
|
||||
m_ReflectionBounces: 1
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &24
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 1
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
m_BounceScale: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_EnvironmentLightingMode: 0
|
||||
m_EnableBakedLightmaps: 0
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 10
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_AtlasSize: 1024
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 1
|
||||
m_CompAOExponentDirect: 0
|
||||
m_Padding: 2
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_LightmapsBakeMode: 1
|
||||
m_TextureCompression: 1
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherFiltering: 1
|
||||
m_FinalGatherRayCount: 256
|
||||
m_ReflectionCompression: 2
|
||||
m_MixedBakeMode: 2
|
||||
m_BakeBackend: 0
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ShowResolutionOverlay: 1
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 1
|
||||
--- !u!114 &42
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_FirstSelected: {fileID: 0}
|
||||
m_sendNavigationEvents: 1
|
||||
m_DragThreshold: 50
|
||||
--- !u!114 &43
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!114 &44
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalAxis: Horizontal
|
||||
m_VerticalAxis: Vertical
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
m_InputActionsPerSecond: 10
|
||||
m_RepeatDelay: 0.5
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!1 &1013149005
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1013149006}
|
||||
- component: {fileID: 1013149007}
|
||||
- component: {fileID: 1013149008}
|
||||
m_Layer: 0
|
||||
m_Name: GameStart
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1013149006
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.26726648, y: 0.43754014, z: -0.046788022}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1013149007
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ae34f89576e17114c97f3cb81dba9ff6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1013149008
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fa01058878b41024abbd731e7118c543, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
settingInfo:
|
||||
logLevel: 0
|
||||
isDebug: 0
|
||||
bundleMode: 1
|
||||
luaBundleMode: 1
|
||||
isUpdate: 1
|
||||
isSDK: 1
|
||||
isSDKLogin: 1
|
||||
isGuide: 1
|
||||
isOpenGM: 0
|
||||
--- !u!4 &57277738265262265
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
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: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1362306110787991495
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d7df5c5e5307f460e917e72bf75ec567, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
enableLog: 1
|
||||
networkType: 3
|
||||
tokens:
|
||||
- appid: 63bdff7d90ca4720b6b6626841f0aad8
|
||||
serverUrl: https://thinkingdata.18183g.com
|
||||
mode: 0
|
||||
timeZone: 0
|
||||
timeZoneId:
|
||||
--- !u!1 &3471622135844523394
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 57277738265262265}
|
||||
- component: {fileID: 1362306110787991495}
|
||||
- component: {fileID: 3471622135844523395}
|
||||
- component: {fileID: 3471622135844523396}
|
||||
m_Layer: 0
|
||||
m_Name: SDKConfig
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &3471622135844523395
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
appid: wjtsq7xrwb48t2uw
|
||||
channel: "\u592A\u521D\u884C\u5148\u9063\u6D4B\u8BD5\u670D"
|
||||
--- !u!114 &3471622135844523396
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
appid: 970c8100f1
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 056c1529afd49eb46aff51e72cf4b877
|
||||
timeCreated: 1496386600
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -125,6 +125,10 @@ namespace GameLogic
|
|||
if (errorAction != null)
|
||||
errorAction();
|
||||
|
||||
if (errorLuaFunc != null)
|
||||
{
|
||||
errorLuaFunc.Call(request.responseCode, request.error);
|
||||
}
|
||||
yield break;
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -438,5 +438,8 @@ GameEvent = {
|
|||
UpdateGongMingLv= "HongMeng.UpdateGongMingLv",
|
||||
--鸿蒙碑新手引导
|
||||
HongMengGuide = "HongMeng.HongMengGuide",
|
||||
},
|
||||
SDK={
|
||||
InitSuccess = "SDK.InitSuccess",
|
||||
}
|
||||
}
|
||||
|
|
@ -954,8 +954,8 @@ ITEM_ITEMNUM_FIELD.index = 1
|
|||
ITEM_ITEMNUM_FIELD.label = 1
|
||||
ITEM_ITEMNUM_FIELD.has_default_value = false
|
||||
ITEM_ITEMNUM_FIELD.default_value = 0
|
||||
ITEM_ITEMNUM_FIELD.type = 5
|
||||
ITEM_ITEMNUM_FIELD.cpp_type = 1
|
||||
ITEM_ITEMNUM_FIELD.type = 3
|
||||
ITEM_ITEMNUM_FIELD.cpp_type = 2
|
||||
|
||||
ITEM_ENDINGTIME_FIELD.name = "endingTime"
|
||||
ITEM_ENDINGTIME_FIELD.full_name = ".rpc.protocols.Item.endingTime"
|
||||
|
|
@ -3407,8 +3407,8 @@ ITEMINFO_OVERLAP_FIELD.index = 1
|
|||
ITEMINFO_OVERLAP_FIELD.label = 1
|
||||
ITEMINFO_OVERLAP_FIELD.has_default_value = false
|
||||
ITEMINFO_OVERLAP_FIELD.default_value = 0
|
||||
ITEMINFO_OVERLAP_FIELD.type = 5
|
||||
ITEMINFO_OVERLAP_FIELD.cpp_type = 1
|
||||
ITEMINFO_OVERLAP_FIELD.type = 3
|
||||
ITEMINFO_OVERLAP_FIELD.cpp_type = 2
|
||||
|
||||
ITEMINFO_NEXTREFRESHTIME_FIELD.name = "nextRefreshTime"
|
||||
ITEMINFO_NEXTREFRESHTIME_FIELD.full_name = ".rpc.protocols.ItemInfo.nextRefreshTime"
|
||||
|
|
@ -4641,8 +4641,8 @@ TEAMONETEAMINFO_REMAINHP_FIELD.index = 3
|
|||
TEAMONETEAMINFO_REMAINHP_FIELD.label = 3
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {}
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.type = 5
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 1
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.type = 3
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2
|
||||
|
||||
TEAMONETEAMINFO.name = "TeamOneTeamInfo"
|
||||
TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo"
|
||||
|
|
|
|||
|
|
@ -320,8 +320,8 @@ FIGHTENDRESPONSE_REMAINHPLIST_FIELD.index = 3
|
|||
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.label = 3
|
||||
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.has_default_value = false
|
||||
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.default_value = {}
|
||||
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.type = 5
|
||||
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.cpp_type = 1
|
||||
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.type = 3
|
||||
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.cpp_type = 2
|
||||
|
||||
FIGHTENDRESPONSE_MISSION_FIELD.name = "mission"
|
||||
FIGHTENDRESPONSE_MISSION_FIELD.full_name = ".rpc.protocols.FightEndResponse.mission"
|
||||
|
|
@ -441,8 +441,8 @@ FASTFIGHTRESPONSE_REMAINHPLIST_FIELD.index = 3
|
|||
FASTFIGHTRESPONSE_REMAINHPLIST_FIELD.label = 3
|
||||
FASTFIGHTRESPONSE_REMAINHPLIST_FIELD.has_default_value = false
|
||||
FASTFIGHTRESPONSE_REMAINHPLIST_FIELD.default_value = {}
|
||||
FASTFIGHTRESPONSE_REMAINHPLIST_FIELD.type = 5
|
||||
FASTFIGHTRESPONSE_REMAINHPLIST_FIELD.cpp_type = 1
|
||||
FASTFIGHTRESPONSE_REMAINHPLIST_FIELD.type = 3
|
||||
FASTFIGHTRESPONSE_REMAINHPLIST_FIELD.cpp_type = 2
|
||||
|
||||
FASTFIGHTRESPONSE_MISSION_FIELD.name = "mission"
|
||||
FASTFIGHTRESPONSE_MISSION_FIELD.full_name = ".rpc.protocols.FastFightResponse.mission"
|
||||
|
|
|
|||
|
|
@ -245,8 +245,8 @@ HEROINFO_HEROHP_FIELD.index = 1
|
|||
HEROINFO_HEROHP_FIELD.label = 1
|
||||
HEROINFO_HEROHP_FIELD.has_default_value = false
|
||||
HEROINFO_HEROHP_FIELD.default_value = 0
|
||||
HEROINFO_HEROHP_FIELD.type = 5
|
||||
HEROINFO_HEROHP_FIELD.cpp_type = 1
|
||||
HEROINFO_HEROHP_FIELD.type = 3
|
||||
HEROINFO_HEROHP_FIELD.cpp_type = 2
|
||||
|
||||
HEROINFO_HEROMAXHP_FIELD.name = "heroMaxHp"
|
||||
HEROINFO_HEROMAXHP_FIELD.full_name = ".rpc.protocols.HeroInfo.heroMaxHp"
|
||||
|
|
@ -255,8 +255,8 @@ HEROINFO_HEROMAXHP_FIELD.index = 2
|
|||
HEROINFO_HEROMAXHP_FIELD.label = 1
|
||||
HEROINFO_HEROMAXHP_FIELD.has_default_value = false
|
||||
HEROINFO_HEROMAXHP_FIELD.default_value = 0
|
||||
HEROINFO_HEROMAXHP_FIELD.type = 5
|
||||
HEROINFO_HEROMAXHP_FIELD.cpp_type = 1
|
||||
HEROINFO_HEROMAXHP_FIELD.type = 3
|
||||
HEROINFO_HEROMAXHP_FIELD.cpp_type = 2
|
||||
|
||||
HEROINFO.name = "HeroInfo"
|
||||
HEROINFO.full_name = ".rpc.protocols.HeroInfo"
|
||||
|
|
@ -302,8 +302,8 @@ TRIALHEROINFO_HEROHP_FIELD.index = 3
|
|||
TRIALHEROINFO_HEROHP_FIELD.label = 1
|
||||
TRIALHEROINFO_HEROHP_FIELD.has_default_value = false
|
||||
TRIALHEROINFO_HEROHP_FIELD.default_value = 0
|
||||
TRIALHEROINFO_HEROHP_FIELD.type = 5
|
||||
TRIALHEROINFO_HEROHP_FIELD.cpp_type = 1
|
||||
TRIALHEROINFO_HEROHP_FIELD.type = 3
|
||||
TRIALHEROINFO_HEROHP_FIELD.cpp_type = 2
|
||||
|
||||
TRIALHEROINFO_LEVEL_FIELD.name = "level"
|
||||
TRIALHEROINFO_LEVEL_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.level"
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -475,6 +475,8 @@ USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD = protobuf.FieldDescriptor();
|
|||
USEHEADFRAMERESPONSE = protobuf.Descriptor();
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD = protobuf.FieldDescriptor();
|
||||
LOGINCONFIRMREQUEST = protobuf.Descriptor();
|
||||
RECHARGESUCCESSINDICATION = protobuf.Descriptor();
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
|
||||
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
|
||||
|
|
@ -4812,6 +4814,23 @@ LOGINCONFIRMREQUEST.enum_types = {}
|
|||
LOGINCONFIRMREQUEST.fields = {}
|
||||
LOGINCONFIRMREQUEST.is_extendable = false
|
||||
LOGINCONFIRMREQUEST.extensions = {}
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.name = "orderId"
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.full_name = ".rpc.protocols.RechargeSuccessIndication.orderId"
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.number = 1
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.index = 0
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.label = 1
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.has_default_value = false
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.default_value = ""
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.type = 9
|
||||
RECHARGESUCCESSINDICATION_ORDERID_FIELD.cpp_type = 9
|
||||
|
||||
RECHARGESUCCESSINDICATION.name = "RechargeSuccessIndication"
|
||||
RECHARGESUCCESSINDICATION.full_name = ".rpc.protocols.RechargeSuccessIndication"
|
||||
RECHARGESUCCESSINDICATION.nested_types = {}
|
||||
RECHARGESUCCESSINDICATION.enum_types = {}
|
||||
RECHARGESUCCESSINDICATION.fields = {RECHARGESUCCESSINDICATION_ORDERID_FIELD}
|
||||
RECHARGESUCCESSINDICATION.is_extendable = false
|
||||
RECHARGESUCCESSINDICATION.extensions = {}
|
||||
|
||||
ActiviteWorkShopReqeust = protobuf.Message(ACTIVITEWORKSHOPREQEUST)
|
||||
ActivityUpateIndication = protobuf.Message(ACTIVITYUPATEINDICATION)
|
||||
|
|
@ -4902,6 +4921,7 @@ RankResponse = protobuf.Message(RANKRESPONSE)
|
|||
ReNameRequest = protobuf.Message(RENAMEREQUEST)
|
||||
RechargeInfoRequest = protobuf.Message(RECHARGEINFOREQUEST)
|
||||
RechargeInfoResponse = protobuf.Message(RECHARGEINFORESPONSE)
|
||||
RechargeSuccessIndication = protobuf.Message(RECHARGESUCCESSINDICATION)
|
||||
RedPointInfo = protobuf.Message(REDPOINTINFO)
|
||||
RefreshFriendStateResponse = protobuf.Message(REFRESHFRIENDSTATERESPONSE)
|
||||
RefreshItemNumRequest = protobuf.Message(REFRESHITEMNUMREQUEST)
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ function GoodFriendMainPanel:OnShow()
|
|||
this.roleImage3:SetActive(false)
|
||||
this.roleImage4:SetActive(false)
|
||||
-- this:FriendListDataShow(true,true)
|
||||
-- this:FriendApplicationDataShow(true,true)
|
||||
this:FriendApplicationDataShow()
|
||||
-- this:FriendSearchDataShow(true,true)
|
||||
-- this:BlackListDataShow(true,true)
|
||||
this.isInRecommendPage = true
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@ function this.Initialize()
|
|||
|
||||
this.isRegister = false
|
||||
|
||||
SDKMgr.onInitLaunchCallback = function(result)
|
||||
if result == "1" then
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.SDK.InitSuccess)
|
||||
end
|
||||
end
|
||||
SDKMgr.onRegisterCallback = function()
|
||||
this.isRegister = true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -125,22 +125,28 @@ function this:BindEvent()
|
|||
|
||||
end
|
||||
|
||||
-- sdk 初始化完成回调
|
||||
function this.OnInitSuccess()
|
||||
this.sdkLoginBtn:SetActive(false)
|
||||
this.SDKLogin()
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function this:AddListener()
|
||||
|
||||
Game.GlobalEvent:AddEvent(Protocal.Connect, this.OnConnect)
|
||||
Game.GlobalEvent:AddEvent(Protocal.Disconnect, this.OnDisconnect)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.LoginSuccess.OnLoginSuccess, this.RefreshLoginStatus)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.LoginSuccess.OnLogout, this.OnLogout)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.SDK.InitSuccess, this.OnInitSuccess)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function this:RemoveListener()
|
||||
|
||||
Game.GlobalEvent:RemoveEvent(Protocal.Connect, this.OnConnect)
|
||||
Game.GlobalEvent:RemoveEvent(Protocal.Disconnect, this.OnDisconnect)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.LoginSuccess.OnLoginSuccess, this.RefreshLoginStatus)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.LoginSuccess.OnLogout, this.OnLogout)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.SDK.InitSuccess, this.OnInitSuccess)
|
||||
end
|
||||
|
||||
function this:OnLogout()
|
||||
|
|
|
|||
|
|
@ -122,6 +122,8 @@ function this.RegisterMessage(network)
|
|||
--跨服天梯信息推送
|
||||
-- socket:RegistNetMessage(MessageTypeProto_pb.HERO_SKIN_USE_INDICATION, this.GetWorldArenaInfoIndication)
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.WorldLevelIndication, this.WorldLevelIndication)
|
||||
-- 充值成功订单推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.RECHARGE_SUCCESS_INDICATION, this.RechargeSuccessOrder)
|
||||
end
|
||||
function this.OpenHongMengTowerGuideIndication(buffer)
|
||||
local data = buffer:DataByte()
|
||||
|
|
@ -874,4 +876,11 @@ function this.WorldLevelIndication(buffer)
|
|||
-- LogError("%%%%%%%%%%世界等级推送 "..msg.worldLeve)
|
||||
PlayerManager.RefreshWorldLeveData(msg.worldLeve)
|
||||
end
|
||||
|
||||
function this.RechargeSuccessOrder(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.RechargeSuccessIndication()
|
||||
msg:ParseFromString(data)
|
||||
PayManager.RechargeSuccessOrder(msg)
|
||||
end
|
||||
return this
|
||||
|
|
@ -35,6 +35,12 @@ function this.onSdkPayResult(id)
|
|||
end
|
||||
end
|
||||
|
||||
function this.RechargeSuccessOrder(msg)
|
||||
LogError("充值成功,orderId = "..tostring(msg.orderId))
|
||||
-- 订单id特殊传值
|
||||
CustomEventManager.SendCustomEvent("PayOrderId", tostring(msg.orderId) ,"0")
|
||||
end
|
||||
|
||||
function this.Pay(id, func)
|
||||
if not func then
|
||||
func = function()end
|
||||
|
|
|
|||
|
|
@ -63,12 +63,14 @@ function HeadManager.GetHeadList()
|
|||
local AllHeadList = ConfigManager.GetAllConfigsDataByKey(ConfigName.ItemConfig, "ItemType", ItemType.Head)
|
||||
local config = ConfigManager.GetConfigDataByKey(ConfigName.PlayerRole, "Role", NameManager.roleSex)
|
||||
for _, head in ipairs(AllHeadList) do
|
||||
if head.Name == Language[11393] then
|
||||
if config.RolePic == head.Id then
|
||||
if head.Ifopen == 1 then
|
||||
if head.Name == Language[11393] then
|
||||
if config.RolePic == head.Id then
|
||||
table.insert(this._MyHeadList, head)
|
||||
end
|
||||
else
|
||||
table.insert(this._MyHeadList, head)
|
||||
end
|
||||
else
|
||||
table.insert(this._MyHeadList, head)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -80,8 +82,9 @@ function HeadManager.GetHeadFrameList()
|
|||
if #this._MyHeadFrameList == 0 then
|
||||
--this._MyHeadFrameList = ConfigManager.GetConfig(ConfigName.PlayerHeadIcon) --ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.ItemConfig, "ItemType", ItemType.HeadFrame, "Ifopen", 1)
|
||||
for key, value in ConfigPairs(ConfigManager.GetConfig(ConfigName.PlayerHeadIcon)) do
|
||||
-- body
|
||||
table.insert(this._MyHeadFrameList,value)
|
||||
if value.Type == 2 then
|
||||
table.insert(this._MyHeadFrameList,value)
|
||||
end
|
||||
end
|
||||
end
|
||||
return this._MyHeadFrameList
|
||||
|
|
|
|||
|
|
@ -114,6 +114,11 @@ function RewardBoxPanel:OnOpen(...)
|
|||
this.rewardGroup = itemConfig[data[2]].RewardGroup
|
||||
this.itemId = itemConfig[data[2]].Id
|
||||
end
|
||||
|
||||
this.scroll.gameObject:GetComponent("RectTransform").sizeDelta = data[1] and Vector2.New(940, 880) or Vector2.New(940, 1000)
|
||||
this.scroll.gameObject:GetComponent("RectTransform").anchoredPosition = data[1] and Vector2.New(0, 415) or Vector2.New(0, 542.6)
|
||||
this.ScrollView.gameObject:GetComponent("RectTransform").sizeDelta = data[1] and Vector2.New(940, 900) or Vector2.New(940, 1000)
|
||||
Util.GetGameObject(this.gameObject,"bg/bg/huangtiao"):SetActive(not not data[1])
|
||||
end
|
||||
|
||||
-- 打开,重新打开时回调
|
||||
|
|
|
|||
|
|
@ -178,13 +178,14 @@ function this.SetEquipData(index,data,equipConfigData,itemConfigData)
|
|||
this.equipPanel[index].curEquipFrame.sprite = Util.LoadSprite(GetQuantityImageByquality(equipConfigData.Quality))
|
||||
this.equipPanel[index].curEquipIcon.sprite = Util.LoadSprite(GetResourcePath(itemConfigData.ResourceID))
|
||||
this.equipPanel[index].curEquipTypeText.text=string.format(Language[11555],GetEquipPosStrByEquipPosNum(equipConfigData.Position))
|
||||
local strPos=""
|
||||
if equipConfigData.ProfessionLimit==0 then
|
||||
strPos= Language[11094]
|
||||
else
|
||||
strPos= Language[11824]
|
||||
end
|
||||
this.equipPanel[index].curEquipPosText.text=string.format(strPos,GetJobStrByJobNum(equipConfigData.ProfessionLimit))
|
||||
-- local strPos=""
|
||||
-- if equipConfigData.ProfessionLimit==0 then
|
||||
-- strPos= Language[11476]
|
||||
-- else
|
||||
-- strPos= Language[11476]
|
||||
-- end
|
||||
-- this.equipPanel[index].curEquipPosText.text=string.format(strPos,GetJobStrByJobNum(equipConfigData.ProfessionLimit))
|
||||
this.equipPanel[index].curEquipPosText.text=string.format("道具种类:%s",GetEquipPosStrByEquipPosNum(equipConfigData.Position))
|
||||
|
||||
if not this.mainProList then
|
||||
this.mainProList = {}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ function SettingInfo:InitComponent(gameObject, rootPanel)
|
|||
this.dropDownTip = Util.GetGameObject(gameObject,"other/box/Dropdown/tip")
|
||||
else
|
||||
this.dropDown = Util.GetGameObject(gameObject,"other/box/Dropdown")
|
||||
this.dropDown.transform.parent.gameObject:SetActive(false)
|
||||
this.dropDown:SetActive(false)
|
||||
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"subChannel":"20201222", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://119.29.193.45:8080/"}
|
||||
{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_shangwu/", "packageVersion":"1.0", "subChannel":"20201222", "version":"1.1.1", "serverUrl":"http://119.29.193.45:8080/"}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/test/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://106.52.122.168:8080/"}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"subChannel":"2000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/xq/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://106.52.122.168:8080/"}
|
||||
Loading…
Reference in New Issue