Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
cd984427c1
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1727,7 +1727,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -2, y: -0.000038146973}
|
||||
m_AnchoredPosition: {x: -2, y: 0.000008123421}
|
||||
m_SizeDelta: {x: 580.9, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &6706607635529974733
|
||||
|
|
@ -1774,7 +1774,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 24
|
||||
m_FontSize: 33
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
|
|
@ -1785,7 +1785,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996"
|
||||
m_Text: "\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709"
|
||||
LanguageIndex: 10911
|
||||
--- !u!1 &7770118332320716803
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -4574,7 +4574,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 175.64996, y: -37}
|
||||
m_AnchoredPosition: {x: 175.64996, y: -10}
|
||||
m_SizeDelta: {x: 351.3, y: 110}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4554839803797323066
|
||||
|
|
@ -4612,7 +4612,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
|
|
|||
|
|
@ -8384,18 +8384,18 @@ RectTransform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 998994106207310902}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 8.981068}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8271367050774912013}
|
||||
- {fileID: 374681534325176530}
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_RootOrder: 4
|
||||
m_Father: {fileID: 761919767455012465}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -29, y: -321}
|
||||
m_SizeDelta: {x: 320.8, y: 83.2}
|
||||
m_AnchoredPosition: {x: 411.8, y: -33}
|
||||
m_SizeDelta: {x: 137.2, y: 52.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3397655281057628550
|
||||
CanvasRenderer:
|
||||
|
|
@ -21962,7 +21962,7 @@ 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: 420.4, y: 290.3}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 125.25, y: 72.82}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!95 &2943735797091566516
|
||||
|
|
@ -22261,7 +22261,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &374681534325176530
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -22276,11 +22276,11 @@ RectTransform:
|
|||
m_Father: {fileID: 772749619619315188}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 354.29996, y: 354.8}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 51, y: 19}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 1.7797618, y: 0.68819666}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3822070334950067397
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -23433,7 +23433,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -80.00004, y: -126}
|
||||
m_SizeDelta: {x: 160, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &3137880424192743195
|
||||
CanvasRenderer:
|
||||
|
|
@ -23614,16 +23614,16 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2776193053574990675}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 8.981068}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_Father: {fileID: 761919767455012465}
|
||||
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: -92.1, y: 141.4}
|
||||
m_AnchoredPosition: {x: -469.6, y: -15.600006}
|
||||
m_SizeDelta: {x: 166, y: 162}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3327170245683651299
|
||||
|
|
@ -24025,16 +24025,16 @@ RectTransform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2915950993045325880}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 8.981068}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2215879582004718398}
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_Father: {fileID: 761919767455012465}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 216.7, y: -104.2}
|
||||
m_AnchoredPosition: {x: 218.59996, y: -107.750046}
|
||||
m_SizeDelta: {x: 218, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &696698095495310382
|
||||
|
|
@ -45273,13 +45273,9 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7187647761999659129}
|
||||
- {fileID: 4998246820548927141}
|
||||
- {fileID: 6825316960939884882}
|
||||
- {fileID: 9158673223480268760}
|
||||
- {fileID: 772749619619315188}
|
||||
m_Father: {fileID: 986452627335843391}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -55309,7 +55305,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5034612710644007650
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -55324,12 +55320,12 @@ RectTransform:
|
|||
- {fileID: 2143439897358225204}
|
||||
- {fileID: 5403756415749798728}
|
||||
- {fileID: 4196182477682311981}
|
||||
m_Father: {fileID: 986452627335843391}
|
||||
m_RootOrder: 6
|
||||
m_Father: {fileID: 1612271237950830011}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1680, y: 2086}
|
||||
m_AnchoredPosition: {x: 692, y: 2172}
|
||||
m_SizeDelta: {x: 148, y: 126}
|
||||
m_Pivot: {x: 0.49999973, y: 0.50000036}
|
||||
--- !u!222 &4883613866719607552
|
||||
|
|
@ -67199,7 +67195,8 @@ RectTransform:
|
|||
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_Children:
|
||||
- {fileID: 5034612710644007650}
|
||||
m_Father: {fileID: 986452627335843391}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -74554,7 +74551,7 @@ RectTransform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6084588643388886236}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 8.981068}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7931078687530562384}
|
||||
|
|
@ -74563,12 +74560,12 @@ RectTransform:
|
|||
- {fileID: 6344674214210519577}
|
||||
- {fileID: 647437164561264364}
|
||||
- {fileID: 1848489891166427785}
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_Father: {fileID: 761919767455012465}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 80, y: -72}
|
||||
m_AnchoredPosition: {x: 81.899994, y: -75.55005}
|
||||
m_SizeDelta: {x: 137, y: 137}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1680107606584974350
|
||||
|
|
@ -77101,8 +77098,8 @@ RectTransform:
|
|||
- {fileID: 7094943317510879996}
|
||||
- {fileID: 1508767087665272957}
|
||||
- {fileID: 173960748325300965}
|
||||
- {fileID: 761919767455012465}
|
||||
- {fileID: 1470640894515440942}
|
||||
- {fileID: 5034612710644007650}
|
||||
- {fileID: 1612271237950830011}
|
||||
- {fileID: 8831099743542526053}
|
||||
- {fileID: 7019400324678272696}
|
||||
|
|
@ -88632,10 +88629,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4196182477682311981}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8027968061220517403
|
||||
CanvasRenderer:
|
||||
|
|
@ -88717,6 +88714,45 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: -1003.2, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8181657184753742378
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 761919767455012465}
|
||||
m_Layer: 0
|
||||
m_Name: Up
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &761919767455012465
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8181657184753742378}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -8.981068}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7187647761999659129}
|
||||
- {fileID: 4998246820548927141}
|
||||
- {fileID: 6825316960939884882}
|
||||
- {fileID: 772749619619315188}
|
||||
m_Father: {fileID: 986452627335843391}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -0.000015258789, y: -50}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8190177820551321418
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -93789,7 +93825,7 @@ RectTransform:
|
|||
- {fileID: 4261057833087068731}
|
||||
- {fileID: 918793633740857750}
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -171,16 +171,16 @@ end
|
|||
|
||||
-- 上报战斗日志
|
||||
function this.SubmitBattleRecord()
|
||||
if not this.isSubmit then
|
||||
PopupTipPanel.ShowTip(Language[10204])
|
||||
return
|
||||
end
|
||||
local _, rcd = this.isHaveRecord()
|
||||
if rcd then
|
||||
NetManager.GMEvent("//".. (rcd.fightId or "") .."|".. PlayerManager.uid .."|"..rcd.seed.."|"..rcd.fightMaxRound.."|"..BattleManager.PrintBattleTable(rcd.fightData))
|
||||
end
|
||||
this.isSubmit = false
|
||||
PopupTipPanel.ShowTip(Language[10205])
|
||||
-- if not this.isSubmit then
|
||||
-- PopupTipPanel.ShowTip(Language[10204])
|
||||
-- return
|
||||
-- end
|
||||
-- local _, rcd = this.isHaveRecord()
|
||||
-- if rcd then
|
||||
-- NetManager.GMEvent("//".. (rcd.fightId or "") .."|".. PlayerManager.uid .."|"..rcd.seed.."|"..rcd.fightMaxRound.."|"..BattleManager.PrintBattleTable(rcd.fightData))
|
||||
-- end
|
||||
-- this.isSubmit = false
|
||||
-- PopupTipPanel.ShowTip(Language[10205])
|
||||
end
|
||||
|
||||
-- 上报战斗日志
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ function this:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddClick(this.ButtonLock, function ()
|
||||
PopupTipPanel.ShowTip(Language[10216])
|
||||
PopupTipPanel.ShowTip("30级或充值任意金额后解锁")
|
||||
end)
|
||||
|
||||
local pauseTime = 31
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@ function this.RequestSendGuildTranscript(func)
|
|||
local channel = CHAT_CHANNEL.FAMILY
|
||||
local guildData = MyGuildManager.GetMyGuildInfo()
|
||||
local content = string.format(
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,135).Desc),
|
||||
GetLanguageStrById("%s发起了集结号角,请全体公会成员前往挑战副本首领!"),
|
||||
PlayerManager.nickName)
|
||||
this.RequestSendChatMsg(channel, content, function()
|
||||
end)
|
||||
|
|
@ -512,7 +512,7 @@ function this.AnalysisGlobalChat(msg)
|
|||
chat.gLimitLv = tonumber(headList[5])
|
||||
chat.joinType = tonumber(headList[6])
|
||||
chat.content = string.format(
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,136).Desc),
|
||||
GetLanguageStrById("<color=#028DEA>%s</color> 级公会 <color=#028DEA>%s</color> 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 <color=#FE4100>%s</color> 级)<color=#66FE00>【马上加入】</color>"),
|
||||
chat.gLv,
|
||||
chat.gName,
|
||||
chat.gLimitLv)
|
||||
|
|
@ -520,7 +520,7 @@ function this.AnalysisGlobalChat(msg)
|
|||
chat.nickName=headList[2]
|
||||
chat.redpackName=GetLanguageStrById(headList[3])
|
||||
chat.content = string.format(
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,137).Desc),
|
||||
GetLanguageStrById("%s 发送了%s,请迅速前往抢夺红包!"),
|
||||
chat.nickName,
|
||||
chat.redpackName)
|
||||
elseif chat.type==GLOBAL_CHAT_TYPE.GUILD_AID then
|
||||
|
|
|
|||
|
|
@ -261,6 +261,8 @@ function EightDayGiftPanel:SetSingleReward(item,i)
|
|||
this:SetBg(i)
|
||||
if ItemConfig[EightDayRewardConfig[i].Reward[1][1]].ItemType == 13 then
|
||||
UIManager.OpenPanel(UIName.SoulPrintPopUp,3,nil,EightDayRewardConfig[i].Reward[1][1],nil,nil)
|
||||
elseif ItemConfig[EightDayRewardConfig[i].Reward[1][1]].ItemType == 20 then
|
||||
UIManager.OpenPanel(UIName.RewardBoxPanel,nil,EightDayRewardConfig[i].Reward[1][1])
|
||||
else
|
||||
ItemViewList[i]:OnBtnCkickEvent(EightDayRewardConfig[i].Reward[1][1])
|
||||
end
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ function ExpeditionHalidomPanel:OnShowSingleHolyData(go,singleHoly)
|
|||
local configData = ConfigManager.GetConfigData(ConfigName.ExpeditionHolyConfig,singleHoly.equiptId)
|
||||
--Log(configData.Icon)
|
||||
Util.GetGameObject(go, "bg"):GetComponent("Image").sprite = Util.LoadSprite(_HalidomQualityConfig[configData.type].bg)
|
||||
Util.GetGameObject(go, "quaImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(configData.type))
|
||||
Util.GetGameObject(go, "quaImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(configData.type + 3))
|
||||
Util.GetGameObject(go, "iconImage"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(configData.Icon))
|
||||
Util.GetGameObject(go, "nameText"):GetComponent("Text").text = GetLanguageStrById(configData.Name)
|
||||
Util.GetGameObject(go, "infoRect/infoText"):GetComponent("Text").text = GetLanguageStrById(configData.Describe)
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ function ExpeditionSelectHalidomPanel:OnShowSingleHolyData(go,singleHoly)
|
|||
configData = ConfigManager.GetConfigData(ConfigName.ExpeditionHolyConfig,singleHoly)
|
||||
--Log(configData.Icon)
|
||||
Util.GetGameObject(go, "bg"):GetComponent("Image").sprite = Util.LoadSprite(_HalidomQualityConfig[configData.type].bg)
|
||||
Util.GetGameObject(go, "quaImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(configData.type))
|
||||
Util.GetGameObject(go, "quaImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(configData.type + 3))
|
||||
Util.GetGameObject(go, "iconImage"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(configData.Icon))-- 报错,资源表里找不到:Util.LoadSprite(GetResourcePath(configData.Icon))
|
||||
Util.GetGameObject(go, "nameText"):GetComponent("Text").text = GetLanguageStrById(configData.Name)
|
||||
Util.GetGameObject(go, "infoRect/infoText"):GetComponent("Text").text = GetLanguageStrById(configData.Describe)
|
||||
|
|
|
|||
|
|
@ -215,7 +215,6 @@ end
|
|||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function GuildTranscriptMainPopup:OnOpen(_curIndex)
|
||||
GuildTranscriptManager.GetGuildChallengeInfoRequest()
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
|
|
@ -228,6 +227,7 @@ function GuildTranscriptMainPopup:OnShow()
|
|||
end
|
||||
this.ShowBossInfo()
|
||||
this.ShowEndNumInfo()
|
||||
GuildTranscriptManager.GetGuildChallengeInfoRequest()
|
||||
end
|
||||
function this.ShowPanelData()
|
||||
cutOpenIndex = GuildTranscriptManager.GetCurBoss()
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ function this:InsertNewText(btn)
|
|||
end
|
||||
|
||||
local isRefeshIcon = true
|
||||
|
||||
local curNPCList = {}
|
||||
--初始化组件(用于子类重写)
|
||||
function this:InitComponent()
|
||||
orginLayer = 0
|
||||
|
|
@ -69,19 +69,19 @@ function this:InitComponent()
|
|||
this.decorateRoot = Util.GetGameObject(self.gameObject, "bg/decorate")
|
||||
self.ctrl = Util.GetGameObject(self.gameObject, "scene/ctrl")
|
||||
|
||||
this.heroTeamPowerBtn = Util.GetGameObject(self.gameObject, "LeftUp/powerBtn")
|
||||
this.heroTeamPower = Util.GetGameObject(self.gameObject, "LeftUp/powerBtn/value"):GetComponent("Text")
|
||||
this.heroTeamPowerBtn = Util.GetGameObject(self.gameObject, "Up/powerBtn")
|
||||
this.heroTeamPower = Util.GetGameObject(self.gameObject, "Up/powerBtn/value"):GetComponent("Text")
|
||||
|
||||
---------------topLeftPart----------------
|
||||
--headBox
|
||||
this.level = Util.GetGameObject(self.gameObject, "LeftUp/headBox/lvFrame/lv"):GetComponent("Text")
|
||||
this.playName = Util.GetGameObject(self.gameObject, "LeftUp/headBox/name"):GetComponent("Text")
|
||||
this.expSliderValue = Util.GetGameObject(self.gameObject, "LeftUp/headBox/exp"):GetComponent("Slider")
|
||||
this.level = Util.GetGameObject(self.gameObject, "Up/headBox/lvFrame/lv"):GetComponent("Text")
|
||||
this.playName = Util.GetGameObject(self.gameObject, "Up/headBox/name"):GetComponent("Text")
|
||||
this.expSliderValue = Util.GetGameObject(self.gameObject, "Up/headBox/exp"):GetComponent("Slider")
|
||||
this.expSliderValue.transform.localScale = Vector3.New(UIManager.adapterScale, 1, 1)
|
||||
|
||||
this.headBox = Util.GetGameObject(self.gameObject, "LeftUp/headBox")
|
||||
this.headPos = Util.GetGameObject(self.gameObject, "LeftUp/headBox/headpos")
|
||||
this.headRedpot = Util.GetGameObject(self.gameObject, "LeftUp/headBox/redpot")
|
||||
this.headBox = Util.GetGameObject(self.gameObject, "Up/headBox")
|
||||
this.headPos = Util.GetGameObject(self.gameObject, "Up/headBox/headpos")
|
||||
this.headRedpot = Util.GetGameObject(self.gameObject, "Up/headBox/redpot")
|
||||
|
||||
-- 七日登陆奖励预览入口
|
||||
this.sgBtn=Util.GetGameObject(self.gameObject,"LeftUp/sevenGift")
|
||||
|
|
@ -97,9 +97,9 @@ function this:InitComponent()
|
|||
effectAdapte(Util.GetGameObject(this.sgEffect[2], "ziti mask (1)"))
|
||||
|
||||
-- 特权
|
||||
this.vipPrivilegeBtn = Util.GetGameObject(self.gameObject, "LeftUp/vipPrivilege/vipPrivilegeBtn")
|
||||
this.vipPrivilegeBtn = Util.GetGameObject(self.gameObject, "Up/vipPrivilege/vipPrivilegeBtn")
|
||||
this.vipLevelText = Util.GetGameObject(this.vipPrivilegeBtn, "bg/vip"):GetComponent("Image")
|
||||
this.vipRedPoint = Util.GetGameObject(self.gameObject, "LeftUp/vipPrivilege/redPoint")
|
||||
this.vipRedPoint = Util.GetGameObject(self.gameObject, "Up/vipPrivilege/redPoint")
|
||||
screenAdapte(this.vipPrivilegeBtn)
|
||||
---------------topRightPart----------------
|
||||
-- 邮件
|
||||
|
|
@ -228,7 +228,7 @@ function this:InitComponent()
|
|||
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip")
|
||||
Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip/Text"):GetComponent("Text").text = Language[10610]
|
||||
|
||||
this.activityTabPrefab = Util.GetGameObject(self.gameObject, "activityTabPrefab")
|
||||
this.activityTabPrefab = Util.GetGameObject(self.gameObject, "RightUp/activityTabPrefab")
|
||||
this.RightUp = Util.GetGameObject(self.gameObject, "RightUp")
|
||||
end
|
||||
|
||||
|
|
@ -301,14 +301,18 @@ function this:BindEvent()
|
|||
-- view.NameText.text = NameManager.GetLocalRandomName()
|
||||
-- view:SetAutoMove()
|
||||
-- end
|
||||
curNPCList = {}
|
||||
PlayerManager.GetMainPlayerNPCData(function(NPCList)
|
||||
for i = 1, #NPCList do
|
||||
local view = MainPlayerView.New(false, this.btnClickMove, rect, Vector2.New(math.random(rect.xMin, rect.xMax), math.random(rect.yMin, rect.yMax)),NPCList[i].sex)
|
||||
view.NameText.text = NPCList[i].userName or NPCList[i].name
|
||||
view:SetAutoMove()
|
||||
view.leader.transform.name = "MainPlayerView"..i
|
||||
table.insert(curNPCList,view)
|
||||
end
|
||||
end)
|
||||
self.playerView = MainPlayerView.New(true, this.btnClickMove, rect, Vector2.New(-1210, 0))
|
||||
table.insert(curNPCList,self.playerView)
|
||||
--角色点击行走
|
||||
self.trigger.onPointerClick = self.trigger.onPointerClick + function(p, d)
|
||||
local x, v2 = RectTransformUtility.ScreenPointToLocalPointInRectangle(btnClickMoveTran, Input.mousePosition, UIManager.camera, nil)
|
||||
|
|
@ -861,10 +865,15 @@ function this:OnShow()
|
|||
|
||||
--检测鸿蒙碑红点
|
||||
HarmonyManager.CheckRedPoinStatusUpTowerMainCityRed()
|
||||
|
||||
FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册
|
||||
end
|
||||
|
||||
|
||||
|
||||
--
|
||||
function this.OnUpdate()
|
||||
--主城人物层级处理
|
||||
this.OnMainPlayerNPCRefresh()
|
||||
end
|
||||
-- 刷新玩家基础信息显示
|
||||
function this.RefreshPlayerInfoShow()
|
||||
this.vipLevelText.sprite = VipManager.SetVipLevelImg()
|
||||
|
|
@ -1099,6 +1108,7 @@ function this:OnClose()
|
|||
PlayerManager.StopBattleUpLvTipTime()
|
||||
this.ChatTipView:StopCheck()
|
||||
PatFaceManager.isLogin = false
|
||||
FixedUpdateBeat:Remove(this.OnUpdate, self)
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
|
@ -1346,4 +1356,24 @@ function this.RefreshBattleUpLvTip()
|
|||
this.battleUpLvTip:GetComponent("Canvas").sortingOrder = orginLayer + 10
|
||||
this.battleUpLvTip:SetActive(true)
|
||||
end
|
||||
local roleRefreshNum = 0
|
||||
function this.OnMainPlayerNPCRefresh()
|
||||
if roleRefreshNum < 60 then
|
||||
roleRefreshNum = roleRefreshNum + 1
|
||||
elseif roleRefreshNum >= 60 and PlayerManager.MainPanelRoleMonveState then
|
||||
roleRefreshNum = 0
|
||||
-- LogRed("PlayerManager.MainPanelRoleMonveState "..tostring(PlayerManager.MainPanelRoleMonveState))
|
||||
if curNPCList and #curNPCList > 0 then
|
||||
table.sort(curNPCList,function(a,b)
|
||||
return a.leader.transform.localPosition.y > b.leader.transform.localPosition.y
|
||||
end)
|
||||
for i = 1, #curNPCList do
|
||||
if curNPCList[i] then
|
||||
curNPCList[i].leader.transform:SetSiblingIndex(i)
|
||||
end
|
||||
end
|
||||
PlayerManager.MainPanelRoleMonveState = false
|
||||
end
|
||||
end
|
||||
end
|
||||
return MainPanel
|
||||
|
|
@ -121,12 +121,12 @@ function MainPlayerView:SetRolePos(pos, delay, func)
|
|||
local dis = Vector2.Distance(pos, self.lastPos)
|
||||
local leaderTran = self.leader:GetComponent("RectTransform")
|
||||
local ov2 = leaderTran.anchoredPosition
|
||||
|
||||
self.tweener = DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 0 end),
|
||||
DG.Tweening.Core.DOSetter_float(function (progress)
|
||||
local v2 = Vector2.Lerp(ov2, pos, progress)
|
||||
leaderTran.anchoredPosition = v2
|
||||
self:SetRolePosZ(v2)
|
||||
PlayerManager.MainPanelRoleMonveState = true
|
||||
end), 1, dis / 200):SetEase(Ease.Linear):SetDelay(delay):SetEase(Ease.Linear):OnComplete(function ()
|
||||
self.lastPos = pos
|
||||
self:PlayerIdle()
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ this.now_index = 0
|
|||
|
||||
--头像框数据
|
||||
this.headFrameList = {}
|
||||
|
||||
this.MainPanelRoleMonveState = false
|
||||
local update = function()
|
||||
local dt = Time.unscaledDeltaTime
|
||||
this.serverTime = this.serverTime + dt
|
||||
|
|
|
|||
|
|
@ -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 = #this.rewardGroup ~= 1 and Vector2.New(940, 880) or Vector2.New(940, 1000)
|
||||
this.scroll.gameObject:GetComponent("RectTransform").anchoredPosition = #this.rewardGroup ~= 1 and Vector2.New(0, 415) or Vector2.New(0, 542.6)
|
||||
this.ScrollView.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 900) or Vector2.New(940, 1000)
|
||||
Util.GetGameObject(this.gameObject,"bg/bg/huangtiao"):SetActive(#this.rewardGroup ~= 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 = {}
|
||||
|
|
|
|||
|
|
@ -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