Merge remote-tracking branch 'origin/master' into ViewOtherPlayer

client_Wu Xijin

2019-04-28 8d06932ebf186837e048da4822bd837dbf90e212

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
using Snxxz.UI; 
using System; 
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
 
public class ClientTreasureDungeon 
{ 
    public const int Client_DataMap = 4000; 
 
    public static int challengeTreasureId = 0; 
 
    public static void RequestEnter(int treasureId) 
    { 
        challengeTreasureId = treasureId; 
 
        var hero = PlayerDatas.Instance.hero; 
        if (hero != null) 
        { 
            hero.StopAll(); 
        } 
 
        MapTransferUtility.Instance.Clear(); 
        ClientDungeonStageUtility.SetClientDungeon(true, (ushort)Client_DataMap); 
        ClientDungeonStageUtility.RequestStartClientDungeon(0, 0); 
        StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand() 
        { 
            toMapId = Client_DataMap, 
            toLineId = 0, 
            needEmpty = true, 
            needLoadResource = true, 
            serverType = ServerType.Main, 
            isClientLoadMap = true 
        }); 
 
        PlayerDatas.Instance.baseData.mainServerMapIdRecord = PlayerDatas.Instance.baseData.MapID; 
        PlayerDatas.Instance.baseData.MapID = (ushort)Client_DataMap; 
    } 
 
    public static void RequestExit() 
    { 
        ClientDungeonStageUtility.SetClientDungeon(false, 0); 
        PlayerDatas.Instance.extersion.pkState = 0; 
        ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData(); 
 
        StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish; 
        StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish; 
 
        PlayerDatas.Instance.baseData.MapID = PlayerDatas.Instance.baseData.mainServerMapIdRecord; 
        StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand() 
        { 
            toMapId = PlayerDatas.Instance.baseData.MapID, 
            toLineId = 0, 
            needEmpty = true, 
            needLoadResource = true, 
            serverType = ServerType.Main, 
            isClientLoadMap = true, 
            refreshPlayerDatas = true 
        }); 
    } 
 
    private static void OnStageLoadFinish() 
    { 
        ClientDungeonStageUtility.RequestExitClientDungeon(); 
        StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish; 
    } 
}