Merge branch 'master' into Equip

client_Wu Xijin

2019-03-05 efa5f8d07fc3321f6ac5f5d97fb422db28d0886f

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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
using System.Collections;
using System.Collections.Generic;
 
using UnityEngine;
using UnityEngine.UI; 
 
namespace Snxxz.UI 
{ 
    [XLua.Hotfix] 
    public class PropertyBehaviour : MonoBehaviour 
    { 
        [SerializeField] Text m_PropertyName; 
        [SerializeField] Text m_PropertyValue; 
        [SerializeField] Text m_PropertyAdd; 
 
        public void Display(int _property, int _value) 
        { 
            var config = PlayerPropertyConfig.Get(_property); 
            if (config != null) 
            { 
                m_PropertyName.text = config.Name; 
                m_PropertyValue.text = StringUtility.Contact( 
                    UIHelper.ReplaceLargeNum(UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                    config.ISPercentage == 1 ? "%" : string.Empty); 
            } 
        } 
 
        public void DisplayUpper(int _property, int _value) 
        { 
            var config = PlayerPropertyConfig.Get(_property); 
            if (config != null) 
            { 
                m_PropertyName.text = config.Name; 
                m_PropertyValue.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( 
                    UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                    config.ISPercentage == 1 ? "%" : string.Empty); 
            } 
        } 
 
        public void DisplayColon(int _property, int _value) 
        { 
            var config = PlayerPropertyConfig.Get(_property); 
            if (config != null) 
            { 
                m_PropertyName.text = StringUtility.Contact(config.Name, "："); 
                m_PropertyValue.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( 
                    UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                    config.ISPercentage == 1 ? "%" : string.Empty); 
            } 
        } 
 
        public void DisplayAdd(int _property, int _value, int _add) 
        { 
            var config = PlayerPropertyConfig.Get(_property); 
            if (config != null) 
            { 
                m_PropertyName.text = StringUtility.Contact(config.Name, "："); 
                m_PropertyValue.text = StringUtility.Contact(UIHelper.ReplaceLargeNum( 
                    UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                    config.ISPercentage == 1 ? "%" : string.Empty); 
                if (_add == 0) 
                { 
                    m_PropertyAdd.text = string.Empty; 
                } 
                else 
                { 
                    m_PropertyAdd.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( 
                        UIHelper.ReplacePercentage(_add, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                       config.ISPercentage == 1 ? "%" : string.Empty); 
                } 
            } 
        } 
 
        public void DisplayGodWeaponAdd(int _property, int _value, int _add) 
        { 
            var config = PlayerPropertyConfig.Get(_property); 
            if (config != null) 
            { 
                m_PropertyName.text = config.Name; 
                m_PropertyValue.text = StringUtility.Contact(UIHelper.ReplaceLargeNum( 
                    UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                    config.ISPercentage == 1 ? "%" : string.Empty); 
                if (_add == 0) 
                { 
                    m_PropertyAdd.text = string.Empty; 
                } 
                else 
                { 
                    m_PropertyAdd.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( 
                        UIHelper.ReplacePercentage(_add, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                       config.ISPercentage == 1 ? "%" : string.Empty); 
                } 
            } 
        } 
 
        public void DisplayCompare(int _property, int _value, int _add) 
        { 
            var config = PlayerPropertyConfig.Get(_property); 
            if (config != null) 
            { 
                m_PropertyName.text = config.Name; 
                m_PropertyValue.text = StringUtility.Contact(UIHelper.ReplaceLargeNum( 
                    UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                    config.ISPercentage == 1 ? "%" : string.Empty); 
                m_PropertyAdd.text = StringUtility.Contact(UIHelper.ReplaceLargeNum( 
                    UIHelper.ReplacePercentage(_add, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                   config.ISPercentage == 1 ? "%" : string.Empty); 
            } 
        } 
 
        public void DisplayUp(int _property, int _value, int _add) 
        { 
            var config = PlayerPropertyConfig.Get(_property); 
            if (config != null) 
            { 
                m_PropertyName.text = config.Name; 
                m_PropertyValue.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( 
                    UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                    config.ISPercentage == 1 ? "%" : string.Empty); 
                if (_add == 0) 
                { 
                    m_PropertyAdd.text = string.Empty; 
                } 
                else 
                { 
                    m_PropertyAdd.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( 
                        UIHelper.ReplacePercentage(_add, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), 
                       config.ISPercentage == 1 ? "%" : string.Empty); 
                } 
            } 
        } 
    } 
}