Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
ZhangBiao
commit
6b26846677
|
|
@ -613,6 +613,10 @@ public class SocketClient
|
|||
m_SendMessage(INDICATION_RESPONSE, null, _event.sid);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("*** 后端推送了未注册的 indication 消息：" + msgId);
|
||||
}
|
||||
//处理请求回应消息
|
||||
if (callbacks.ContainsKey(msgId))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ AnimationClip:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UI_Effect_ChuFaEffect_01
|
||||
m_Name: UI_Effect_ChuFaEffect_01_anim
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
|
|
@ -6,7 +6,7 @@ AnimatorController:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UI_Effect_ChuFaEffect_01
|
||||
m_Name: UI_Effect_ChuFaEffect_01_ctr
|
||||
serializedVersion: 5
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
|
|
@ -6,7 +6,7 @@ AnimationClip:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UI_Effect_ChuFaEffect_02
|
||||
m_Name: UI_Effect_ChuFaEffect_02_anim
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
|
|
@ -6,7 +6,7 @@ AnimatorController:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UI_Effect_ChuFaEffect_02
|
||||
m_Name: UI_Effect_ChuFaEffect_02_ctr
|
||||
serializedVersion: 5
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Flare029
|
||||
m_Name: Flare029_mat
|
||||
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: H_tirl_216
|
||||
m_Name: H_tirl_216_mat
|
||||
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Matrix182
|
||||
m_Name: Matrix182_mat
|
||||
m_Shader: {fileID: 4800000, guid: 8a2b842cc5f3c414ca13c6df98e8e718, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UI_fuzhou_01
|
||||
m_Name: UI_fuzhou_01_mat
|
||||
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: c_ax_0067_2
|
||||
m_Name: c_ax_0067_2_mat
|
||||
m_Shader: {fileID: 4800000, guid: 5a335d9deda6b7441bcb6311537b7dec, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: xl_022
|
||||
m_Name: xl_022_mat
|
||||
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
|
@ -44371,7 +44371,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &803833580
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -50675,7 +50675,8 @@ RectTransform:
|
|||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1.5, y: 2, z: 1}
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 211290745896557341}
|
||||
m_Father: {fileID: 1067819436}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -67585,6 +67586,43 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 50, y: -210}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &637792617563968846
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 211290745896557341}
|
||||
m_Layer: 5
|
||||
m_Name: effect
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &211290745896557341
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 637792617563968846}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7280880023922043713}
|
||||
- {fileID: 8428796604345438602}
|
||||
m_Father: {fileID: 1527551389}
|
||||
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!1 &662797417174379503
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -93426,6 +93464,83 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1930861571818194028
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7280880023922043713}
|
||||
- component: {fileID: 1365141408880860342}
|
||||
- component: {fileID: 6499702488415910557}
|
||||
m_Layer: 0
|
||||
m_Name: UV
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7280880023922043713
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1930861571818194028}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 28.619247, y: 7.1491976, z: -104.97824}
|
||||
m_LocalScale: {x: 49.435078, y: 35.373283, z: 1035.4575}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 211290745896557341}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &1365141408880860342
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1930861571818194028}
|
||||
m_Mesh: {fileID: 4300000, guid: d2388b7f2d458314eb686bf69d5e978d, type: 3}
|
||||
--- !u!23 &6499702488415910557
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1930861571818194028}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 85b1c6e8a42d2d142a4c567626e13f18, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
--- !u!1 &1932682776016190710
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -228970,6 +229085,83 @@ ParticleSystemRenderer:
|
|||
m_Mesh2: {fileID: 0}
|
||||
m_Mesh3: {fileID: 0}
|
||||
m_MaskInteraction: 0
|
||||
--- !u!1 &8217667930954647338
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8428796604345438602}
|
||||
- component: {fileID: 3750917631116573834}
|
||||
- component: {fileID: 7275575743249620867}
|
||||
m_Layer: 0
|
||||
m_Name: glow
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8428796604345438602
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8217667930954647338}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 1.7, y: -3.7, z: -99.97783}
|
||||
m_LocalScale: {x: 38.336586, y: 21.780416, z: 190.17947}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 211290745896557341}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &3750917631116573834
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8217667930954647338}
|
||||
m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3}
|
||||
--- !u!23 &7275575743249620867
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8217667930954647338}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 87bd79c849a70314c9d80131b6a7cbe1, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
--- !u!1 &8271166807888768028
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -10046,10 +10046,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2446092371378317743}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 1024, y: 356}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2320830795291865921
|
||||
CanvasRenderer:
|
||||
|
|
@ -15507,10 +15507,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7912888359326409945}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 1024, y: 356}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6451737078576014230
|
||||
CanvasRenderer:
|
||||
|
|
@ -20665,10 +20665,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7709482234995581048}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 1024, y: 356}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7933083477942549309
|
||||
CanvasRenderer:
|
||||
|
|
@ -25738,10 +25738,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4256510347403179104}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 1024, y: 356}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4987689455791440949
|
||||
CanvasRenderer:
|
||||
|
|
@ -26204,7 +26204,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -14.5, y: 27.9}
|
||||
m_AnchoredPosition: {x: -14.5, y: 27.899994}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &8344043800134731827
|
||||
|
|
|
|||
|
|
@ -6,344 +6,344 @@ filter: Linear,Linear
|
|||
repeat: none
|
||||
Btou
|
||||
rotate: false
|
||||
xy: 692, 492
|
||||
size: 192, 192
|
||||
orig: 192, 192
|
||||
xy: 807, 858
|
||||
size: 164, 164
|
||||
orig: 164, 164
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Btoufa02
|
||||
rotate: true
|
||||
xy: 2, 2
|
||||
size: 143, 174
|
||||
orig: 143, 174
|
||||
xy: 162, 240
|
||||
size: 122, 149
|
||||
orig: 122, 149
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Byifi03
|
||||
rotate: false
|
||||
xy: 188, 254
|
||||
size: 174, 188
|
||||
orig: 174, 188
|
||||
xy: 162, 364
|
||||
size: 149, 161
|
||||
orig: 149, 161
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Byifi04
|
||||
rotate: false
|
||||
xy: 2, 722
|
||||
size: 335, 300
|
||||
orig: 335, 300
|
||||
xy: 2, 765
|
||||
size: 287, 257
|
||||
orig: 287, 257
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Byifi04a
|
||||
rotate: false
|
||||
xy: 2, 444
|
||||
size: 244, 276
|
||||
orig: 244, 276
|
||||
xy: 2, 527
|
||||
size: 209, 236
|
||||
orig: 209, 236
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Byifi05
|
||||
rotate: true
|
||||
xy: 941, 843
|
||||
size: 36, 81
|
||||
orig: 36, 81
|
||||
xy: 451, 274
|
||||
size: 31, 69
|
||||
orig: 31, 69
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fbiyan
|
||||
rotate: false
|
||||
xy: 369, 73
|
||||
size: 121, 34
|
||||
orig: 121, 34
|
||||
rotate: true
|
||||
xy: 973, 918
|
||||
size: 104, 29
|
||||
orig: 104, 29
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fjiao01
|
||||
rotate: false
|
||||
xy: 692, 721
|
||||
size: 18, 20
|
||||
orig: 18, 20
|
||||
xy: 545, 515
|
||||
size: 16, 17
|
||||
orig: 16, 17
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fjiao02
|
||||
rotate: false
|
||||
xy: 692, 699
|
||||
size: 18, 20
|
||||
orig: 18, 20
|
||||
xy: 563, 515
|
||||
size: 16, 17
|
||||
orig: 16, 17
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fkuzi01
|
||||
rotate: false
|
||||
xy: 188, 97
|
||||
size: 179, 155
|
||||
orig: 179, 155
|
||||
xy: 595, 515
|
||||
size: 153, 133
|
||||
orig: 153, 133
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fshou01
|
||||
rotate: false
|
||||
xy: 544, 62
|
||||
size: 70, 31
|
||||
orig: 70, 31
|
||||
xy: 807, 830
|
||||
size: 60, 26
|
||||
orig: 60, 26
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fshou02
|
||||
rotate: false
|
||||
xy: 653, 95
|
||||
size: 58, 67
|
||||
orig: 58, 67
|
||||
xy: 750, 519
|
||||
size: 50, 58
|
||||
orig: 50, 58
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ftou
|
||||
rotate: true
|
||||
xy: 369, 109
|
||||
size: 162, 176
|
||||
orig: 162, 176
|
||||
rotate: false
|
||||
xy: 157, 87
|
||||
size: 139, 151
|
||||
orig: 139, 151
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ftoufa01
|
||||
rotate: false
|
||||
xy: 712, 808
|
||||
size: 227, 214
|
||||
orig: 227, 214
|
||||
xy: 611, 839
|
||||
size: 194, 183
|
||||
orig: 194, 183
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ftoufa02
|
||||
rotate: false
|
||||
xy: 886, 519
|
||||
size: 109, 165
|
||||
orig: 109, 165
|
||||
xy: 449, 390
|
||||
size: 94, 142
|
||||
orig: 94, 142
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ftui01
|
||||
rotate: true
|
||||
xy: 886, 492
|
||||
size: 25, 65
|
||||
orig: 25, 65
|
||||
xy: 869, 834
|
||||
size: 22, 56
|
||||
orig: 22, 56
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ftui02
|
||||
rotate: true
|
||||
xy: 941, 809
|
||||
size: 32, 70
|
||||
orig: 32, 70
|
||||
rotate: false
|
||||
xy: 125, 21
|
||||
size: 28, 60
|
||||
orig: 28, 60
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyifu01
|
||||
rotate: false
|
||||
xy: 492, 53
|
||||
size: 50, 54
|
||||
orig: 50, 54
|
||||
xy: 927, 810
|
||||
size: 43, 46
|
||||
orig: 43, 46
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyifu02
|
||||
rotate: true
|
||||
xy: 616, 52
|
||||
size: 41, 50
|
||||
orig: 41, 50
|
||||
xy: 806, 734
|
||||
size: 35, 43
|
||||
orig: 35, 43
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyifu03
|
||||
rotate: false
|
||||
xy: 547, 164
|
||||
size: 132, 53
|
||||
orig: 132, 53
|
||||
xy: 324, 521
|
||||
size: 113, 46
|
||||
orig: 113, 46
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyifu04
|
||||
rotate: false
|
||||
xy: 558, 499
|
||||
size: 132, 242
|
||||
orig: 132, 242
|
||||
xy: 324, 569
|
||||
size: 113, 208
|
||||
orig: 113, 208
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyifu05
|
||||
rotate: false
|
||||
xy: 248, 471
|
||||
size: 127, 249
|
||||
orig: 127, 249
|
||||
xy: 213, 549
|
||||
size: 109, 214
|
||||
orig: 109, 214
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyifu06
|
||||
rotate: false
|
||||
xy: 543, 743
|
||||
size: 167, 279
|
||||
orig: 167, 279
|
||||
xy: 466, 783
|
||||
size: 143, 239
|
||||
orig: 143, 239
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyixiu01
|
||||
rotate: false
|
||||
xy: 941, 881
|
||||
size: 75, 141
|
||||
orig: 75, 141
|
||||
rotate: true
|
||||
xy: 2, 17
|
||||
size: 64, 121
|
||||
orig: 64, 121
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyixiu03
|
||||
rotate: true
|
||||
xy: 547, 95
|
||||
size: 67, 104
|
||||
orig: 67, 104
|
||||
rotate: false
|
||||
xy: 772, 643
|
||||
size: 57, 89
|
||||
orig: 57, 89
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyixiu04
|
||||
rotate: true
|
||||
xy: 364, 273
|
||||
size: 95, 186
|
||||
orig: 95, 186
|
||||
xy: 611, 650
|
||||
size: 82, 159
|
||||
orig: 82, 159
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fyixiu04a
|
||||
rotate: true
|
||||
xy: 369, 21
|
||||
size: 50, 101
|
||||
orig: 50, 101
|
||||
rotate: false
|
||||
xy: 724, 427
|
||||
size: 43, 86
|
||||
orig: 43, 86
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Fzhuangshi
|
||||
rotate: false
|
||||
xy: 682, 235
|
||||
size: 146, 97
|
||||
orig: 146, 97
|
||||
xy: 157, 2
|
||||
size: 125, 83
|
||||
orig: 125, 83
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Rbiyan
|
||||
rotate: false
|
||||
xy: 668, 59
|
||||
size: 46, 34
|
||||
orig: 46, 34
|
||||
xy: 972, 817
|
||||
size: 40, 29
|
||||
orig: 40, 29
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Rjiao
|
||||
rotate: false
|
||||
xy: 292, 2
|
||||
size: 20, 19
|
||||
orig: 20, 19
|
||||
rotate: true
|
||||
xy: 125, 2
|
||||
size: 17, 16
|
||||
orig: 17, 16
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Rkuzi
|
||||
rotate: false
|
||||
xy: 558, 337
|
||||
size: 124, 160
|
||||
orig: 124, 160
|
||||
xy: 313, 246
|
||||
size: 106, 137
|
||||
orig: 106, 137
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Rshou01
|
||||
rotate: true
|
||||
xy: 927, 242
|
||||
size: 79, 44
|
||||
orig: 79, 44
|
||||
xy: 973, 848
|
||||
size: 68, 38
|
||||
orig: 68, 38
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Rtou
|
||||
rotate: false
|
||||
xy: 377, 518
|
||||
size: 179, 218
|
||||
orig: 179, 218
|
||||
xy: 2, 83
|
||||
size: 153, 187
|
||||
orig: 153, 187
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Rtoua
|
||||
rotate: true
|
||||
xy: 552, 219
|
||||
size: 116, 128
|
||||
orig: 116, 128
|
||||
rotate: false
|
||||
xy: 545, 403
|
||||
size: 100, 110
|
||||
orig: 100, 110
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Rtoufa01
|
||||
rotate: true
|
||||
xy: 377, 370
|
||||
size: 146, 179
|
||||
orig: 146, 179
|
||||
xy: 439, 534
|
||||
size: 125, 154
|
||||
orig: 125, 154
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Rtui
|
||||
rotate: true
|
||||
xy: 681, 164
|
||||
size: 34, 84
|
||||
orig: 34, 84
|
||||
rotate: false
|
||||
xy: 769, 445
|
||||
size: 29, 72
|
||||
orig: 29, 72
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ryifu01
|
||||
rotate: false
|
||||
xy: 684, 334
|
||||
size: 156, 156
|
||||
orig: 156, 156
|
||||
xy: 313, 385
|
||||
size: 134, 134
|
||||
orig: 134, 134
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ryifu06
|
||||
rotate: false
|
||||
xy: 339, 738
|
||||
size: 202, 284
|
||||
orig: 202, 284
|
||||
xy: 291, 779
|
||||
size: 173, 243
|
||||
orig: 173, 243
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ryifu07
|
||||
rotate: false
|
||||
xy: 2, 147
|
||||
size: 184, 295
|
||||
orig: 184, 295
|
||||
xy: 2, 272
|
||||
size: 158, 253
|
||||
orig: 158, 253
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ryixiu01
|
||||
rotate: true
|
||||
xy: 178, 7
|
||||
size: 88, 112
|
||||
orig: 88, 112
|
||||
rotate: false
|
||||
xy: 647, 417
|
||||
size: 75, 96
|
||||
orig: 75, 96
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
Ryixiu02
|
||||
rotate: true
|
||||
xy: 830, 233
|
||||
size: 88, 95
|
||||
orig: 88, 95
|
||||
rotate: false
|
||||
xy: 451, 307
|
||||
size: 75, 81
|
||||
orig: 75, 81
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing01
|
||||
rotate: false
|
||||
xy: 682, 200
|
||||
size: 116, 33
|
||||
orig: 116, 33
|
||||
rotate: true
|
||||
xy: 421, 283
|
||||
size: 100, 28
|
||||
orig: 100, 28
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing02
|
||||
rotate: true
|
||||
xy: 800, 200
|
||||
size: 33, 21
|
||||
orig: 33, 21
|
||||
xy: 1004, 960
|
||||
size: 28, 18
|
||||
orig: 28, 18
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing03
|
||||
rotate: false
|
||||
xy: 713, 95
|
||||
size: 50, 67
|
||||
orig: 50, 67
|
||||
xy: 806, 771
|
||||
size: 43, 57
|
||||
orig: 43, 57
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing04
|
||||
rotate: false
|
||||
xy: 292, 23
|
||||
size: 75, 72
|
||||
orig: 75, 72
|
||||
xy: 750, 579
|
||||
size: 64, 62
|
||||
orig: 64, 62
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing05
|
||||
rotate: true
|
||||
xy: 842, 323
|
||||
size: 167, 140
|
||||
orig: 167, 140
|
||||
rotate: false
|
||||
xy: 466, 661
|
||||
size: 143, 120
|
||||
orig: 143, 120
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing07
|
||||
rotate: false
|
||||
xy: 953, 496
|
||||
size: 37, 21
|
||||
orig: 37, 21
|
||||
rotate: true
|
||||
xy: 1004, 990
|
||||
size: 32, 18
|
||||
orig: 32, 18
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
rs
|
||||
rotate: true
|
||||
xy: 712, 686
|
||||
size: 120, 225
|
||||
orig: 120, 225
|
||||
xy: 611, 734
|
||||
size: 103, 193
|
||||
orig: 103, 193
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shadow
|
||||
rotate: false
|
||||
xy: 248, 444
|
||||
size: 104, 25
|
||||
orig: 104, 25
|
||||
rotate: true
|
||||
xy: 439, 688
|
||||
size: 89, 22
|
||||
orig: 89, 22
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 495 KiB After Width: | Height: | Size: 392 KiB |
Binary file not shown.
|
|
@ -5,8 +5,8 @@ format: RGBA8888
|
|||
filter: Linear,Linear
|
||||
repeat: none
|
||||
b_piaodai_12
|
||||
rotate: false
|
||||
xy: 399, 335
|
||||
rotate: true
|
||||
xy: 178, 18
|
||||
size: 186, 146
|
||||
orig: 186, 146
|
||||
offset: 0, 0
|
||||
|
|
@ -20,140 +20,140 @@ b_toufa_5
|
|||
index: -1
|
||||
b_tui_19
|
||||
rotate: true
|
||||
xy: 197, 2
|
||||
xy: 652, 762
|
||||
size: 76, 186
|
||||
orig: 76, 186
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
b_yifu_8
|
||||
rotate: false
|
||||
xy: 674, 763
|
||||
size: 242, 259
|
||||
orig: 242, 259
|
||||
rotate: true
|
||||
xy: 652, 840
|
||||
size: 182, 230
|
||||
orig: 182, 230
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing_1
|
||||
rotate: true
|
||||
xy: 796, 217
|
||||
rotate: false
|
||||
xy: 66, 2
|
||||
size: 52, 50
|
||||
orig: 52, 50
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing_3
|
||||
rotate: true
|
||||
xy: 178, 465
|
||||
rotate: false
|
||||
xy: 397, 810
|
||||
size: 253, 212
|
||||
orig: 253, 212
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing_6
|
||||
rotate: true
|
||||
xy: 781, 335
|
||||
xy: 751, 343
|
||||
size: 139, 68
|
||||
orig: 139, 68
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing_7
|
||||
rotate: true
|
||||
xy: 810, 69
|
||||
xy: 883, 347
|
||||
size: 58, 80
|
||||
orig: 58, 80
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
biaoqing_8
|
||||
rotate: false
|
||||
xy: 661, 609
|
||||
xy: 646, 69
|
||||
size: 135, 78
|
||||
orig: 135, 78
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_biyan_14
|
||||
rotate: true
|
||||
xy: 796, 271
|
||||
rotate: false
|
||||
xy: 2, 2
|
||||
size: 62, 50
|
||||
orig: 62, 50
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_fashi_1
|
||||
rotate: true
|
||||
xy: 967, 114
|
||||
xy: 967, 518
|
||||
size: 45, 55
|
||||
orig: 45, 55
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_fashi_10
|
||||
rotate: false
|
||||
xy: 848, 252
|
||||
xy: 751, 261
|
||||
size: 74, 80
|
||||
orig: 74, 80
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_fashi_12
|
||||
rotate: false
|
||||
xy: 892, 84
|
||||
xy: 949, 565
|
||||
size: 73, 75
|
||||
orig: 73, 75
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_fashi_3
|
||||
rotate: false
|
||||
xy: 797, 13
|
||||
xy: 431, 72
|
||||
size: 45, 54
|
||||
orig: 45, 54
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_fashi_6
|
||||
rotate: false
|
||||
xy: 726, 490
|
||||
rotate: true
|
||||
xy: 559, 2
|
||||
size: 64, 117
|
||||
orig: 64, 117
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_fashi_7
|
||||
rotate: false
|
||||
xy: 734, 215
|
||||
xy: 783, 50
|
||||
size: 60, 118
|
||||
orig: 60, 118
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_piaodai_24
|
||||
rotate: false
|
||||
xy: 392, 483
|
||||
rotate: true
|
||||
xy: 529, 490
|
||||
size: 186, 123
|
||||
orig: 186, 123
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_shou_33
|
||||
rotate: true
|
||||
xy: 844, 15
|
||||
rotate: false
|
||||
xy: 120, 17
|
||||
size: 52, 35
|
||||
orig: 52, 35
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_shou_37
|
||||
rotate: true
|
||||
xy: 568, 45
|
||||
rotate: false
|
||||
xy: 356, 479
|
||||
size: 45, 25
|
||||
orig: 45, 25
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_tou_15
|
||||
rotate: true
|
||||
xy: 417, 162
|
||||
rotate: false
|
||||
xy: 356, 506
|
||||
size: 171, 170
|
||||
orig: 171, 170
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_toufa_11
|
||||
rotate: false
|
||||
xy: 832, 680
|
||||
xy: 853, 559
|
||||
size: 94, 81
|
||||
orig: 94, 81
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_toufa_13
|
||||
rotate: true
|
||||
xy: 810, 129
|
||||
xy: 883, 407
|
||||
size: 86, 80
|
||||
orig: 86, 80
|
||||
offset: 0, 0
|
||||
|
|
@ -166,204 +166,204 @@ f_toufa_39
|
|||
offset: 0, 0
|
||||
index: -1
|
||||
f_toufa_5
|
||||
rotate: true
|
||||
xy: 180, 80
|
||||
rotate: false
|
||||
xy: 397, 678
|
||||
size: 247, 130
|
||||
orig: 247, 130
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_toufa_8
|
||||
rotate: false
|
||||
xy: 748, 92
|
||||
rotate: true
|
||||
xy: 654, 484
|
||||
size: 60, 121
|
||||
orig: 60, 121
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_toufa_9
|
||||
rotate: true
|
||||
xy: 603, 43
|
||||
xy: 853, 495
|
||||
size: 62, 112
|
||||
orig: 62, 112
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_tui_29
|
||||
rotate: true
|
||||
xy: 2, 2
|
||||
rotate: false
|
||||
xy: 429, 311
|
||||
size: 70, 193
|
||||
orig: 70, 193
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_tui_30
|
||||
rotate: true
|
||||
xy: 417, 92
|
||||
xy: 646, 692
|
||||
size: 68, 184
|
||||
orig: 68, 184
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_xiong_16
|
||||
rotate: true
|
||||
xy: 580, 483
|
||||
rotate: false
|
||||
xy: 654, 546
|
||||
size: 123, 144
|
||||
orig: 123, 144
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_yifu_20
|
||||
rotate: false
|
||||
xy: 2, 74
|
||||
xy: 178, 470
|
||||
size: 176, 248
|
||||
orig: 176, 248
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_yifu_40
|
||||
rotate: true
|
||||
xy: 674, 689
|
||||
rotate: false
|
||||
xy: 779, 534
|
||||
size: 72, 156
|
||||
orig: 72, 156
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_yifu_41
|
||||
rotate: false
|
||||
xy: 916, 343
|
||||
xy: 821, 364
|
||||
size: 60, 129
|
||||
orig: 60, 129
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_yixiu_31
|
||||
rotate: false
|
||||
xy: 920, 474
|
||||
xy: 748, 170
|
||||
size: 83, 89
|
||||
orig: 83, 89
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_yixiu_32
|
||||
rotate: true
|
||||
xy: 798, 578
|
||||
rotate: false
|
||||
xy: 649, 345
|
||||
size: 100, 137
|
||||
orig: 100, 137
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_yixiu_35
|
||||
rotate: false
|
||||
xy: 892, 161
|
||||
xy: 827, 267
|
||||
size: 78, 78
|
||||
orig: 78, 78
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
f_yixiu_36
|
||||
rotate: true
|
||||
xy: 603, 107
|
||||
xy: 501, 68
|
||||
size: 106, 143
|
||||
orig: 106, 143
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_biyan_23
|
||||
rotate: true
|
||||
xy: 967, 72
|
||||
rotate: false
|
||||
xy: 982, 760
|
||||
size: 40, 41
|
||||
orig: 40, 41
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_fashi_1
|
||||
rotate: false
|
||||
xy: 851, 334
|
||||
rotate: true
|
||||
xy: 840, 738
|
||||
size: 63, 140
|
||||
orig: 63, 140
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_fashi_20
|
||||
rotate: true
|
||||
xy: 717, 2
|
||||
xy: 678, 2
|
||||
size: 65, 78
|
||||
orig: 65, 78
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_piaodai_14
|
||||
rotate: false
|
||||
xy: 178, 329
|
||||
rotate: true
|
||||
xy: 884, 803
|
||||
size: 219, 134
|
||||
orig: 219, 134
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_tou_24
|
||||
rotate: true
|
||||
xy: 587, 335
|
||||
rotate: false
|
||||
xy: 501, 296
|
||||
size: 146, 192
|
||||
orig: 146, 192
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_toufa_21
|
||||
rotate: true
|
||||
xy: 397, 608
|
||||
rotate: false
|
||||
xy: 178, 206
|
||||
size: 144, 262
|
||||
orig: 144, 262
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_toufa_22
|
||||
rotate: true
|
||||
xy: 928, 693
|
||||
rotate: false
|
||||
xy: 853, 642
|
||||
size: 102, 94
|
||||
orig: 102, 94
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_toufa_25
|
||||
rotate: false
|
||||
xy: 924, 241
|
||||
rotate: true
|
||||
xy: 649, 277
|
||||
size: 66, 100
|
||||
orig: 66, 100
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_toufa_3
|
||||
rotate: false
|
||||
xy: 589, 215
|
||||
xy: 501, 176
|
||||
size: 143, 118
|
||||
orig: 143, 118
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_toufa_4
|
||||
rotate: false
|
||||
xy: 937, 565
|
||||
rotate: true
|
||||
xy: 431, 2
|
||||
size: 64, 126
|
||||
orig: 64, 126
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_tui_17
|
||||
rotate: true
|
||||
xy: 385, 22
|
||||
rotate: false
|
||||
xy: 431, 128
|
||||
size: 68, 181
|
||||
orig: 68, 181
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_xiong_5
|
||||
rotate: true
|
||||
xy: 792, 476
|
||||
rotate: false
|
||||
xy: 646, 149
|
||||
size: 100, 126
|
||||
orig: 100, 126
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_yifu_12
|
||||
rotate: false
|
||||
xy: 397, 754
|
||||
size: 275, 268
|
||||
orig: 275, 268
|
||||
xy: 2, 54
|
||||
size: 174, 268
|
||||
orig: 174, 268
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_yixiu_8
|
||||
rotate: false
|
||||
xy: 918, 797
|
||||
xy: 324, 243
|
||||
size: 103, 225
|
||||
orig: 103, 225
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
l_yixiu_8b
|
||||
rotate: false
|
||||
xy: 312, 102
|
||||
xy: 326, 16
|
||||
size: 103, 225
|
||||
orig: 103, 225
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shadow
|
||||
rotate: false
|
||||
xy: 312, 86
|
||||
xy: 174, 2
|
||||
size: 59, 14
|
||||
orig: 59, 14
|
||||
offset: 0, 0
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 542 KiB After Width: | Height: | Size: 537 KiB |
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -17,8 +17,8 @@ local type = {
|
|||
bg = "r_Dungeon_rendi_01",
|
||||
name = "r_Dungeon_richangfuben",
|
||||
live = "lingjijuyuan",
|
||||
livePos = Vector2(149, 13),
|
||||
liveSize = Vector2(1024, 1145),
|
||||
livePos = Vector2(0,0),
|
||||
liveSize = Vector2(1023,356),
|
||||
tipBg = "r_Dungeon_richangdian",
|
||||
resetTime = string.format("<color=#7884B9>%s</color>",GetLanguageStrById(specialConfig[58].Value)),
|
||||
tip = string.format("<color=#7884B9>%s</color>",GetLanguageStrById(specialConfig[59].Value)),
|
||||
|
|
@ -29,8 +29,8 @@ local type = {
|
|||
bg = "r_Dungeon_rendi_02",
|
||||
name = "r_Dungeon_xinmoshilian",
|
||||
live = "shixueguimo",
|
||||
livePos = Vector2(77, -218),
|
||||
liveSize = Vector2(1024, 1145),
|
||||
livePos = Vector2(0,0),
|
||||
liveSize = Vector2(1023,356),
|
||||
tipBg = "r_Dungeon_shijiandian",
|
||||
resetTime = string.format("<color=#7EB2B6>%s</color>",GetLanguageStrById(specialConfig[60].Value)),
|
||||
tip = string.format("<color=#7EB2B6>%s</color>",GetLanguageStrById(specialConfig[61].Value)),
|
||||
|
|
@ -41,8 +41,8 @@ local type = {
|
|||
bg = "r_Dungeon_rendi_03",
|
||||
name = "r_Dungeon_danaotiangong",
|
||||
live = "w_wd_boss",
|
||||
livePos = Vector2(192, 0),
|
||||
liveSize = Vector2(1024, 1145),
|
||||
livePos = Vector2(0,0),
|
||||
liveSize = Vector2(1023,356),
|
||||
tipBg = "r_Dungeon_juqingdian",
|
||||
resetTime = string.format("<color=#BA9AC2>%s</color>",GetLanguageStrById(specialConfig[62].Value)),
|
||||
tip = string.format("<color=#BA9AC2>%s</color>",GetLanguageStrById(specialConfig[63].Value)),
|
||||
|
|
@ -53,8 +53,8 @@ local type = {
|
|||
bg = "r_Dungeon_rendi_04",
|
||||
name = "r_Dungeon_chechidoufa",
|
||||
live = "m_syjm_0026_png",
|
||||
livePos = Vector2(334, 32),
|
||||
liveSize = Vector2(1024, 1145),
|
||||
livePos = Vector2(0,0),
|
||||
liveSize = Vector2(1023,356),
|
||||
tipBg = "r_Dungeon_wujingdian",
|
||||
resetTime = string.format("<color=#DB9A9A>%s</color>",GetLanguageStrById(specialConfig[64].Value)),
|
||||
tip = string.format("<color=#DB9A9A>%s</color>",GetLanguageStrById(specialConfig[65].Value)),
|
||||
|
|
@ -286,8 +286,8 @@ function this.UpdateCarbonContent()
|
|||
local di = Util.GetGameObject(v, "bg/InfoBg/InfoBg/Image")
|
||||
local dropContent = Util.GetGameObject(v, "bg/InfoBg/InfoBg/dropContent")
|
||||
live:GetComponent("Image").sprite = Util.LoadSprite(data.live)
|
||||
--live:GetComponent("RectTransform").localPosition = data.livePos
|
||||
--live:GetComponent("RectTransform").sizeDelta = data.liveSize
|
||||
live:GetComponent("RectTransform").localPosition = data.livePos
|
||||
live:GetComponent("RectTransform").sizeDelta = data.liveSize
|
||||
name:GetComponent("Image").sprite = Util.LoadSprite(data.name.."_zh")
|
||||
name:GetComponent("RectTransform").localPosition = type[carbonType].namePos
|
||||
name:GetComponent("RectTransform").sizeDelta = type[carbonType].nameSize
|
||||
|
|
|
|||
|
|
@ -141,39 +141,8 @@ function this:GetOpenTime(id)
|
|||
return str
|
||||
end
|
||||
|
||||
|
||||
|
||||
this.UpdateCarbonContent = function(...)
|
||||
LogBlue("type长度： "..LengthOfTable(activityType))
|
||||
if not activityType then
|
||||
activityType = {
|
||||
[1] = {
|
||||
bg = "ui_fb_btn_jy",
|
||||
name = Language[10331],
|
||||
gameObject = "renjiebaojing" ,
|
||||
},
|
||||
[2] = {
|
||||
bg = "ui_fb_btn_gh",
|
||||
name = Language[10332],
|
||||
gameObject = "fuochanbaojing" ,
|
||||
},
|
||||
[3] = {
|
||||
bg = "ui_fb_btn_sl",
|
||||
name = Language[10333],
|
||||
gameObject = "yaolingbaojing" ,
|
||||
},
|
||||
[4] = {
|
||||
bg = "ui_fb_btn_jq",
|
||||
name = Language[10334],
|
||||
gameObject = "daoxuanbaojing" ,
|
||||
},
|
||||
}
|
||||
end
|
||||
local temp = {...}
|
||||
local temp = temp[1]
|
||||
if index and index >= 0 then
|
||||
Timer.New(function()
|
||||
local openFunctions = {}
|
||||
this.refreshShow = function()
|
||||
local openFunctions = {}
|
||||
for k,v in pairs(activityType) do
|
||||
local go = Util.GetGameObject(this.AnimRoot, v.gameObject)
|
||||
go:GetComponent("Image").sprite = Util.LoadSprite(v.bg)
|
||||
|
|
@ -213,7 +182,39 @@ this.UpdateCarbonContent = function(...)
|
|||
end
|
||||
this:TimeCountDown(openFunctions)
|
||||
this.remainTimes.text = XuanYuanMirrorManager.GetTimeTip()
|
||||
end, index):Start()
|
||||
end
|
||||
|
||||
this.UpdateCarbonContent = function(...)
|
||||
LogBlue("type长度： "..LengthOfTable(activityType))
|
||||
if not activityType then
|
||||
activityType = {
|
||||
[1] = {
|
||||
bg = "ui_fb_btn_jy",
|
||||
name = Language[10331],
|
||||
gameObject = "renjiebaojing" ,
|
||||
},
|
||||
[2] = {
|
||||
bg = "ui_fb_btn_gh",
|
||||
name = Language[10332],
|
||||
gameObject = "fuochanbaojing" ,
|
||||
},
|
||||
[3] = {
|
||||
bg = "ui_fb_btn_sl",
|
||||
name = Language[10333],
|
||||
gameObject = "yaolingbaojing" ,
|
||||
},
|
||||
[4] = {
|
||||
bg = "ui_fb_btn_jq",
|
||||
name = Language[10334],
|
||||
gameObject = "daoxuanbaojing" ,
|
||||
},
|
||||
}
|
||||
end
|
||||
local temp = {...}
|
||||
local temp = temp[1]
|
||||
if index and index >= 0 then
|
||||
this.refreshShow()
|
||||
Timer.New(this.refreshShow, index):Start()
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -52,6 +52,11 @@ function ActivityMainPanel:RemoveListener()
|
|||
end
|
||||
|
||||
function ActivityMainPanel:CheckActOpen(_index)
|
||||
for i = 1, #tabs do
|
||||
if tabs[i].Sort == _index then
|
||||
_index = i
|
||||
end
|
||||
end
|
||||
if tabs[_index].IfBack == 1 then
|
||||
if tabs[_index].ActiveType > 0 then
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType)
|
||||
|
|
@ -100,7 +105,7 @@ function ActivityMainPanel:OnOpen(_activityType,_index)
|
|||
break
|
||||
end
|
||||
end
|
||||
DynamicActivityManager.AddUIList(tabs[_CurPageIndex].Jump)
|
||||
--DynamicActivityManager.AddUIList(tabs[_CurPageIndex].Jump)
|
||||
end
|
||||
|
||||
-- 打开，重新打开时回调
|
||||
|
|
|
|||
|
|
@ -34,7 +34,11 @@ function this.RemoveUIList()
|
|||
end
|
||||
end
|
||||
function this.ChangeUIList(jumpId)
|
||||
this.OpenUIList[#this.OpenUIList] = jumpId
|
||||
if #this.OpenUIList < 1 then
|
||||
this.OpenUIList[1] = jumpId
|
||||
else
|
||||
this.OpenUIList[#this.OpenUIList] = jumpId
|
||||
end
|
||||
for i,v in ipairs(this.OpenUIList) do
|
||||
LogGreen("ChangeUIList:"..v)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -294,11 +294,11 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown,str)
|
|||
this.timer = nil
|
||||
end
|
||||
this.timer = Timer.New(function()
|
||||
if _timeTextExpert then
|
||||
if _timeTextExpert and tostring(_timeTextExpert) ~= "null" then
|
||||
if str then
|
||||
_timeTextExpert.text = str..this.TimeStampToDateString(timeDown)
|
||||
_timeTextExpert.text = str..this.TimeStampToDateString(timeDown)
|
||||
else
|
||||
_timeTextExpert.text = Language[10023]..this.TimeStampToDateString(timeDown)
|
||||
_timeTextExpert.text = Language[10023]..this.TimeStampToDateString(timeDown)
|
||||
end
|
||||
end
|
||||
if timeDown < 0 then
|
||||
|
|
|
|||
|
|
@ -319,6 +319,8 @@ local jumpDic = {
|
|||
else
|
||||
PopupTipPanel.ShowTip(Language[11396])
|
||||
end
|
||||
else
|
||||
this.JumpActivity(JumpType.Expert,data[1])
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
|
@ -636,6 +638,7 @@ function this.JumpActivity(data,skipfactor)
|
|||
if UIManager.IsOpen(UIName.ActivityMainPanel) then
|
||||
UIManager.ClosePanel(UIName.ActivityMainPanel)
|
||||
end
|
||||
DynamicActivityManager.AddUIList(this.jumpId)
|
||||
UIManager.OpenPanel(UIName.ActivityMainPanel,data,skipfactor)
|
||||
end
|
||||
-- function this.GetTip(openType,openValue)
|
||||
|
|
|
|||
|
|
@ -217,27 +217,27 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.HeadChange_Head, RedPointType.Setting_Head)
|
||||
|
||||
--限时活动（达人）
|
||||
RPData:SetParent(RedPointType.Expert_FastExplore, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_AreaExper, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_UpStarExper, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_EquipExper, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_GoldExper, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_FightExper, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_FastExplore, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_AreaExper, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_UpStarExper, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_EquipExper, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_GoldExper, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_FightExper, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_EnergyExper, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_AccumulativeRecharge, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_Talisman, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_SoulPrint, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_AccumulativeRecharge, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_Talisman, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_SoulPrint, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.LuckyCat, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_WeekCard, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.HERO_STAR_GIFT, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_FindTreasure, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_LuckyTurn, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_Recruit, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_SecretBox, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_UpLv, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.ContinuityRecharge, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_Expedition, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_Slhj, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_FindTreasure, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_LuckyTurn, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_Recruit, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_SecretBox, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_UpLv, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.ContinuityRecharge, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_Expedition, RedPointType.Expert)
|
||||
-- RPData:SetParent(RedPointType.Expert_Slhj, RedPointType.Expert)
|
||||
RPData:SetParent(RedPointType.Expert_LimitExchange, RedPointType.DynamicActivity)
|
||||
--战力排行
|
||||
RPData:SetParent(RedPointType.WarPowerSort_Sort, RedPointType.WarPowerSort)
|
||||
|
|
|
|||
Loading…
Reference in New Issue