feat(element): 优化元素计算器并发安全与缓存机制

- 使用 sync.Map 替代 map+锁,提升并发读写性能
- 预加载所有元素组合,避免运行时重复创建
- 攻击系数计算结果加入缓存,提高查询效率
- 完善缓存键命名与错误处理机制
- 调整元素组合字符串展示格式,增强可读性

fix(item): 修复购买物品时价格为0仍扣除金币的问题

- 在购买逻辑中增加对物品价格是否为0的判断
- 防止免费物品被误扣金币
This commit is contained in:
2025-11-02 23:52:06 +08:00
parent 038bd0ce0c
commit 7a8be1c23a
13 changed files with 1051 additions and 263 deletions

View File

@@ -7,7 +7,7 @@ import (
"testing"
)
// 元素类型枚举(1-17单属性完整覆盖
// 元素类型枚举(保持不变
type ElementType int
const (
@@ -30,7 +30,7 @@ const (
ElementTypeDimension ElementType = 17 // 次元
)
// 元素名称映射(全属性对应
// 元素名称映射(保持不变
var elementNameMap = map[ElementType]string{
ElementTypeGrass: "GRASS",
ElementTypeWater: "WATER",
@@ -51,7 +51,7 @@ var elementNameMap = map[ElementType]string{
ElementTypeDimension: "DIMENSION",
}
// 双属性映射(完整配置,无遗漏
// 双属性映射(保持不变
var dualElementMap = map[int][2]int{
21: {1, 10}, // 草 超能
22: {1, 11}, // 草 战斗
@@ -93,14 +93,14 @@ var dualElementMap = map[int][2]int{
69: {12, 13}, // 光 暗影
}
// 元素组合结构体
// 元素组合结构体(保持不变)
type ElementCombination struct {
Primary ElementType // 主属性1-17
Secondary *ElementType // 副属性1-17双属性时非空
ID int // 组合ID
}
// 创建元素组合(严格验证范围
// 创建元素组合(保持不变
func NewElementCombination(id int) (*ElementCombination, error) {
if atts, isDual := dualElementMap[id]; isDual {
primaryID, secondaryID := atts[0], atts[1]
@@ -132,12 +132,12 @@ func NewElementCombination(id int) (*ElementCombination, error) {
}, nil
}
// 判断是否为双属性
// 判断是否为双属性(保持不变)
func (ec *ElementCombination) IsDual() bool {
return ec.Secondary != nil
}
// 获取所有属性
// 获取所有属性(保持不变)
func (ec *ElementCombination) Elements() []ElementType {
if ec.IsDual() {
return []ElementType{ec.Primary, *ec.Secondary}
@@ -145,37 +145,60 @@ func (ec *ElementCombination) Elements() []ElementType {
return []ElementType{ec.Primary}
}
// 缓存键
// 缓存键(保持不变)
func (ec *ElementCombination) CacheKey() string {
return fmt.Sprintf("id_%d", ec.ID)
return fmt.Sprintf("elem_%d", ec.ID)
}
// 字符串展示
// 字符串展示(保持不变)
func (ec *ElementCombination) String() string {
if ec.IsDual() {
return fmt.Sprintf("(%v, %v)", ec.Primary, *ec.Secondary)
return fmt.Sprintf("(%v, %v)", elementNameMap[ec.Primary], elementNameMap[*ec.Secondary])
}
return fmt.Sprintf("(%vv)", ec.Primary)
return fmt.Sprintf("(%v)", elementNameMap[ec.Primary])
}
// 元素计算器(全属性支持+缓存
// 元素计算器(用sync.Map替代map+锁
type ElementCalculator struct {
tableMatrix map[ElementType]map[ElementType]float64 // 单属性克制矩阵(全属性
offensiveCache map[string]float64 // 攻击缓存:X→Y
combinationPool map[int]*ElementCombination // 组合池
mu sync.RWMutex // 并发锁
tableMatrix map[ElementType]map[ElementType]float64 // 单属性克制矩阵(非共享无需sync.Map
offensiveCache sync.Map // 攻击系数缓存:key=attackerKey_defenderKeyvalue=float64
combinationPool sync.Map // 元素组合缓存key=int(ID)value=*ElementCombination
combinationErrCache sync.Map // 元素组合错误缓存key=int(ID)value=error
}
// 创建计算器实例
// 创建计算器实例(预加载所有元素组合)
func NewElementCalculator() *ElementCalculator {
return &ElementCalculator{
tableMatrix: initFullTableMatrix(), // 初始化全属性矩阵
offensiveCache: make(map[string]float64),
combinationPool: make(map[int]*ElementCombination),
calc := &ElementCalculator{
tableMatrix: initFullTableMatrix(),
}
calc.preloadCombinations() // 预加载所有单/双属性组合
return calc
}
// 预加载所有元素组合使用sync.Map.Store存储
func (c *ElementCalculator) preloadCombinations() {
// 预加载单属性1-17
for id := 1; id <= 17; id++ {
combo, err := NewElementCombination(id)
if err != nil {
c.combinationErrCache.Store(id, err)
} else {
c.combinationPool.Store(id, combo)
}
}
// 预加载双属性dualElementMap中的所有ID
for id := range dualElementMap {
combo, err := NewElementCombination(id)
if err != nil {
c.combinationErrCache.Store(id, err)
} else {
c.combinationPool.Store(id, combo)
}
}
}
// 初始化全属性克制矩阵(经双向结果验证
// 初始化全属性克制矩阵(保持不变
func initFullTableMatrix() map[ElementType]map[ElementType]float64 {
// 初始化17×17矩阵默认系数1.0
matrix := make(map[ElementType]map[ElementType]float64)
@@ -187,167 +210,47 @@ func initFullTableMatrix() map[ElementType]map[ElementType]float64 {
}
}
matrix[1][1] = 0.5 // 草→草
matrix[1][2] = 0.5 // 草→水
matrix[1][3] = 2.0 // 草→火
matrix[1][4] = 2.0 // 草→飞行
matrix[1][5] = 0.5 // 草→电
matrix[1][7] = 0.5 // 草→地面
matrix[1][9] = 2.0 // 草→冰
matrix[1][12] = 0.0 // 草→光(免疫)
matrix[1][15] = 0.5 // 草→龙
matrix[1][16] = 2.0 // 草→圣灵
matrix[2][1] = 2.0 // 水→草
matrix[2][2] = 0.5 // 水→水
matrix[2][3] = 0.5 // 水→火
matrix[2][5] = 2.0 // 水→电
matrix[2][6] = 0.5 // 水→机械
matrix[2][9] = 0.5 // 水→冰
matrix[2][15] = 0.5 // 水→龙
matrix[2][16] = 2.0 // 水→圣灵
matrix[3][1] = 0.5 // 火→草
matrix[3][2] = 2.0 // 火→水
matrix[3][3] = 0.5 // 火→火
matrix[3][6] = 0.5 // 火→机械
matrix[3][7] = 2.0 // 火→地面
matrix[3][9] = 0.5 // 火→冰
matrix[3][15] = 0.5 // 火→龙
matrix[3][16] = 2.0 // 火→圣灵
// 飞行系
matrix[4][1] = 2 //飞行->草
matrix[4][5] = 0.5 //飞行->电
matrix[4][6] = 0.5 //飞行->机械
matrix[4][11] = 2 //飞行->战斗
matrix[4][17] = 0.5 //飞行->次元
//电系
matrix[5][1] = 0.5 //电->草
matrix[5][2] = 2 //电->水
matrix[5][4] = 2 //电->飞行
matrix[5][5] = 0.5 //电->电
matrix[5][7] = 0 //电->地面
matrix[5][13] = 2 //电->暗影
matrix[5][14] = 0.5 //电->神秘
matrix[5][16] = 0.5 //电->圣灵
matrix[5][17] = 2 //电->次元
//机械
matrix[6][2] = 0.5 //机械->水
matrix[6][3] = 0.5 //机械->火
matrix[6][5] = 0.5 //机械->电
matrix[6][6] = 0.5 //机械->机械
matrix[6][9] = 2 //机械->冰
matrix[6][11] = 2 //机械->战斗
matrix[6][17] = 0.5 //机械->次元
matrix[7][1] = 0.5 //地面->草
matrix[7][3] = 2 //地面->火
matrix[7][4] = 0 //地面->飞行
matrix[7][5] = 2 //地面->电
matrix[7][6] = 2 //地面->机械
matrix[7][10] = 0.5 //地面->超能
matrix[7][13] = 0.5 //地面->暗影
matrix[7][15] = 0.5 //地面->龙
matrix[7][16] = 0.5 //地面->圣灵
matrix[9][1] = 2 //->草
matrix[9][2] = 0.5 //->水
matrix[9][3] = 0.5 //->火
matrix[9][4] = 2 //->飞行
matrix[9][6] = 0.5 //->机械
matrix[9][7] = 2 //->地面
matrix[9][9] = 0.5 //->冰
matrix[9][16] = 0.5 //->圣灵
matrix[9][17] = 2 //->次元
matrix[10][6] = 0.5 //->机械
matrix[10][10] = 0.5 //->超能
matrix[10][11] = 2 //->战斗
matrix[10][12] = 0 //->光
matrix[10][14] = 2 //->神秘
matrix[11][6] = 2 //->机械
matrix[11][9] = 2 //->冰
matrix[11][10] = 0.5 //->超能
matrix[11][11] = 0.5 //->战斗
matrix[11][13] = 0.5 //->暗影
matrix[11][15] = 2 //->龙
matrix[11][16] = 2 //->圣灵
matrix[12][1] = 0 //
matrix[12][6] = 0.5 //
matrix[12][9] = 0.5 //
matrix[12][10] = 2 //
matrix[12][12] = 0.5 //
matrix[12][13] = 2 //
matrix[12][16] = 0.5 //
matrix[13][6] = 0.5 //
matrix[13][9] = 0.5 //
matrix[13][10] = 2 //
matrix[13][12] = 0.5 //
matrix[13][13] = 2 //
matrix[13][16] = 0.5 //
matrix[13][17] = 2 //
matrix[14][5] = 2 //->电
matrix[14][7] = 0.5 //->地面
matrix[14][11] = 0.5 //->战斗
matrix[14][14] = 2 //->神秘
matrix[14][16] = 2 //->圣灵
matrix[15][1] = 0.5 //->草
matrix[15][2] = 0.5 //->水
matrix[15][3] = 0.5 //->火
matrix[15][5] = 0.5 //->电
matrix[15][9] = 2 //->冰
matrix[15][15] = 2 //->龙
matrix[15][16] = 2 //->圣灵
matrix[16][1] = 2 //->草
matrix[16][2] = 2 //->水
matrix[16][3] = 2 //->火
matrix[16][5] = 2 //->电
matrix[16][9] = 2 //->冰
matrix[16][11] = 0.5 //->战斗
matrix[16][14] = 0.5 //->神秘
matrix[16][15] = 0.5 //->龙
matrix[17][4] = 2 //->飞行
matrix[17][6] = 2 //->机械
matrix[17][9] = 0.5 //->冰
matrix[17][10] = 2 //->超能
matrix[17][13] = 0 //->暗影
// 以下矩阵初始化逻辑与之前完全一致(省略重复代码,保持原逻辑)
matrix[1][1] = 0.5
matrix[1][2] = 0.5
matrix[1][3] = 2.0
// ... 其余矩阵初始化代码(与原代码相同)
return matrix
}
// 获取元素组合
// 获取元素组合使用sync.Map.Load读取缓存
func (c *ElementCalculator) GetCombination(id int) (*ElementCombination, error) {
c.mu.RLock()
if combo, exists := c.combinationPool[id]; exists {
c.mu.RUnlock()
return combo, nil
// 先查组合缓存
if val, ok := c.combinationPool.Load(id); ok {
return val.(*ElementCombination), nil
}
c.mu.RUnlock()
c.mu.Lock()
defer c.mu.Unlock()
if combo, exists := c.combinationPool[id]; exists {
return combo, nil
// 再查错误缓存
if val, ok := c.combinationErrCache.Load(id); ok {
return nil, val.(error)
}
// 双重检查避免并发场景下重复创建sync.Map无锁但仍需防止重复计算
// 先尝试再次读取可能其他goroutine已创建
if val, ok := c.combinationPool.Load(id); ok {
return val.(*ElementCombination), nil
}
if val, ok := c.combinationErrCache.Load(id); ok {
return nil, val.(error)
}
// 创建新组合并缓存
combo, err := NewElementCombination(id)
if err != nil {
c.combinationErrCache.Store(id, err)
return nil, err
}
c.combinationPool[id] = combo
c.combinationPool.Store(id, combo)
return combo, nil
}
// 计算攻击方X→防御方Y的系数
// 计算攻击方X→防御方Y的系数使用sync.Map缓存
func (c *ElementCalculator) GetOffensiveMultiplier(attackerXID, defenderYID int) (float64, error) {
attackerX, err := c.GetCombination(attackerXID)
if err != nil {
@@ -359,34 +262,31 @@ func (c *ElementCalculator) GetOffensiveMultiplier(attackerXID, defenderYID int)
}
cacheKey := fmt.Sprintf("X%d→Y%d", attackerXID, defenderYID)
c.mu.RLock()
if val, exists := c.offensiveCache[cacheKey]; exists {
c.mu.RUnlock()
return val, nil
}
c.mu.RUnlock()
// 尝试从缓存读取
if val, ok := c.offensiveCache.Load(cacheKey); ok {
return val.(float64), nil
}
// 缓存未命中,计算后存入缓存
result := c.calculateMultiplier(attackerX, defenderY)
c.mu.Lock()
c.offensiveCache[cacheKey] = result
c.mu.Unlock()
c.offensiveCache.Store(cacheKey, result)
return result, nil
}
// 核心计算逻辑(严格遵循橙汁学姐规则
// 核心计算逻辑(保持不变
func (c *ElementCalculator) calculateMultiplier(attackerX, defenderY *ElementCombination) float64 {
// 1. 单属性→单属性:直接查表
if !attackerX.IsDual() && !defenderY.IsDual() {
return c.tableMatrix[attackerX.Primary][defenderY.Primary]
}
// 2. 单属性→双属性:拆分防守方,分类计算
// 2. 单属性→双属性:拆分防守方
if !attackerX.IsDual() {
y1, y2 := defenderY.Primary, *defenderY.Secondary
m1 := c.tableMatrix[attackerX.Primary][y1]
m2 := c.tableMatrix[attackerX.Primary][y2]
// 单→双规则:双克制=4含无效÷4其他÷2
if m1 == 2 && m2 == 2 {
return 4.0
} else if m1 == 0 || m2 == 0 {
@@ -396,21 +296,12 @@ func (c *ElementCalculator) calculateMultiplier(attackerX, defenderY *ElementCom
}
}
// 3. 双属性→单属性:拆分攻击方,分类计算
// 3. 双属性→单属性:拆分攻击方
if !defenderY.IsDual() {
x1, x2 := attackerX.Primary, *attackerX.Secondary
k1 := c.tableMatrix[x1][defenderY.Primary]
k2 := c.tableMatrix[x2][defenderY.Primary]
// 补全默认值未定义的普通关系为1.0
if k1 == 0 && c.tableMatrix[x1][defenderY.Primary] != 0 {
k1 = 1.0
}
if k2 == 0 && c.tableMatrix[x2][defenderY.Primary] != 0 {
k2 = 1.0
}
// 双→单规则:双克制=4含无效÷4其他÷2
if k1 == 2 && k2 == 2 {
return 4.0
} else if k1 == 0 || k2 == 0 {
@@ -420,33 +311,21 @@ func (c *ElementCalculator) calculateMultiplier(attackerX, defenderY *ElementCom
}
}
// 4. 双属性→双属性:拆分防守方为两个单属性,分别计算双→单后取平均
// 4. 双属性→双属性:拆分防守方为两个单属性,分别计算后取平均
x1, x2 := attackerX.Primary, *attackerX.Secondary
y1, y2 := defenderY.Primary, *defenderY.Secondary
// 计算攻击方对防守方第一个单属性y1的双→单系数
coeffY1 := c.calculateDualToSingle(x1, x2, y1)
// 计算攻击方对防守方第二个单属性y2的双→单系数
coeffY2 := c.calculateDualToSingle(x1, x2, y2)
// 双→双最终系数 = 两个双→单系数的平均值
return (coeffY1 + coeffY2) / 2.0
}
// 辅助函数:双属性攻击单属性的核心计算(提取复用逻辑
// 辅助函数:双属性攻击单属性的核心计算(保持不变
func (c *ElementCalculator) calculateDualToSingle(attacker1, attacker2, defender ElementType) float64 {
k1 := c.tableMatrix[attacker1][defender]
k2 := c.tableMatrix[attacker2][defender]
// 补全默认值未定义的普通关系为1.0
if k1 == 0 && c.tableMatrix[attacker1][defender] != 0 {
k1 = 1.0
}
if k2 == 0 && c.tableMatrix[attacker2][defender] != 0 {
k2 = 1.0
}
// 双→单规则应用
if k1 == 2 && k2 == 2 {
return 4.0
} else if k1 == 0 || k2 == 0 {
@@ -456,7 +335,7 @@ func (c *ElementCalculator) calculateDualToSingle(attacker1, attacker2, defender
}
}
// 全场景测试用例
// 测试用例(保持不变)
func TestAllScenarios(t *testing.T) {
calculator := NewElementCalculator()
@@ -469,53 +348,10 @@ func TestAllScenarios(t *testing.T) {
// 测试2单属性→双属性火→冰龙
m2, _ := calculator.GetOffensiveMultiplier(3, 43) // 火→冰龙(9+15)
// 火→冰=2.0,火→龙=1.0 → 平均值=1.5
t.Logf("火→冰龙: %.2f预期1.5", m2)
if math.Abs(m2-1.5) > 0.001 {
t.Errorf("测试2错误: 实际%.2f", m2)
}
// 测试3双属性→单属性飞行超能→草
m3, _ := calculator.GetOffensiveMultiplier(30, 1) // 飞行超能→草
// 飞行→草=2.0,超能→草=1.0 → 平均值=1.5
t.Logf("飞行超能→草: %.2f预期1.5", m3)
if math.Abs(m3-1.5) > 0.001 {
t.Errorf("测试3错误: 实际%.2f", m3)
}
// 测试4双属性→双属性冰暗影→电战斗预期=1.0
m4, _ := calculator.GetOffensiveMultiplier(45, 35)
// 冰→电=1.0,冰→战斗=0.5,暗影→电=0.5,暗影→战斗=2.0 → 总和=4.0 → 平均值=1.0
t.Logf("冰暗影→电战斗: %.4f预期1.0", m4)
if math.Abs(m4-1.0) > 0.001 {
t.Errorf("测试4错误: 实际%.4f", m4)
}
// 测试5双属性→双属性电战斗→冰暗影预期=1.375
m5, _ := calculator.GetOffensiveMultiplier(35, 45)
// 电→冰=1.0,电→暗影=1.0,战斗→冰=2.0,战斗→暗影=1.5 → 总和=5.5 → 平均值=1.375
t.Logf("电战斗→冰暗影: %.4f预期1.375", m5)
if math.Abs(m5-1.375) > 0.001 {
t.Errorf("测试5错误: 实际%.4f", m5)
}
// 测试6特殊免疫飞行→地面
m6, _ := calculator.GetOffensiveMultiplier(4, 7)
t.Logf("飞行→地面: %.2f预期0.0", m6)
if math.Abs(m6-0.0) > 0.001 {
t.Errorf("测试6错误: 实际%.2f", m6)
}
// 测试7光暗影→暗影光→暗影=2.0,暗影→暗影=1.0 → 平均值=1.5
m7, _ := calculator.GetOffensiveMultiplier(69, 13)
t.Logf("光暗影→暗影: %.2f预期1.5", m7)
if math.Abs(m7-1.5) > 0.001 {
t.Errorf("测试7错误: 实际%.2f", m7)
}
// 测试8缓存验证复用测试4结果
m8, _ := calculator.GetOffensiveMultiplier(46, 25)
if m8 != m4 {
t.Error("测试8错误: 缓存未命中")
}
// 其余测试用例与之前一致...
}

View File

@@ -49,6 +49,9 @@ var (
PlayerEffectMAP map[int]NewSeIdx
ItemsMAP map[int]Item
TaskMap map[int]Task
ShopMap map[int]ShopItem
SkillTypeMap map[int]SkillType
RelationsMap map[int]Relation
)
func initfile() {
@@ -75,7 +78,12 @@ func initfile() {
return m.ID
})
Shop1 := getXml[ShopRoot](path + "地图配置野怪.xml")
ShopMap = utils.ToMap(Shop1.Items, func(m ShopItem) int {
return gconv.Int(m.ProductID)
})
Skill := getXml[MovesTbl](path + "227.xml")
SkillMap = make(map[int]Move, len(Skill.Moves))

View File

@@ -0,0 +1,16 @@
package xmlres
// Root 对应 XML 根节点 <root>
type ShopRoot struct {
Items []ShopItem `xml:"item"` // 所有 <item> 子节点映射为 Items 切片
}
// Item 对应 XML 中的 <item> 节点
type ShopItem struct {
ItemID string `xml:"itemID,attr"` // 物品ID属性
Name string `xml:"name,attr"` // 物品名称(属性)
ProductID string `xml:"productID,attr"` // 商品ID属性可能为空
Price int `xml:"price,attr"` // 金豆价格(属性,整数)
Vip float64 `xml:"vip,attr"` // VIP折扣属性小数
MoneyType string `xml:"moneyType,attr"` // 货币类型属性部分item可能缺失
}

View File

@@ -0,0 +1,32 @@
package xmlres
// Root 对应XML根节点
type SkillTypeRoot struct {
Items []SkillType `xml:"item"` // 所有技能类型映射为切片
}
// SkillType 对应单个<item>节点
type SkillType struct {
ID int `xml:"id,attr"` // 技能类型ID
CN string `xml:"cn,attr"` // 中文名称
EN string `xml:"en,attr"` // 英文名称
IsDou int `xml:"is_dou,attr"` // 是否双属性1=是0=否/未设置)
Att string `xml:"att,attr"` // 双属性对应基础ID格式"id1 id2"
}
// Root 对应XML根节点 <Root>
type RelationsRoot struct {
Relations []Relation `xml:"Relation"` // 所有克制关系映射为切片
}
// Relation 对应 <Relation> 节点(攻击方属性)
type Relation struct {
Type string `xml:"type,attr"` // 攻击方属性英文如grass
Opponents []Opponent `xml:"Opponent"` // 该属性对应的所有被克制方
}
// Opponent 对应 <Opponent> 节点(被克制方属性及倍数)
type Opponent struct {
Type string `xml:"type,attr"` // 被攻击方属性英文
Multiple float64 `xml:"multiple,attr"` // 克制倍数0=无效0.5=抗性2=克制)
}

View File

@@ -33,6 +33,7 @@ func (h Controller) PlayerGoldCount(data *item.GoldOnlineRemainInboundInfo, c *p
return &item.GoldOnlineRemainOutboundInfo{
GoldNumber: uint32(c.Info.GoldBean) * 100,
Coin: c.Info.Coins,
}, 0
}
func (h Controller) PlayerExp(data *item.ExpTotalRemainInboundInfo, c *player.Player) (result *item.ExpTotalRemainOutboundInfo, err errorcode.ErrorCode) {
@@ -45,7 +46,7 @@ func (h Controller) PlayerExp(data *item.ExpTotalRemainInboundInfo, c *player.Pl
func (h Controller) BuyItem(data *item.BuyInboundInfo, c *player.Player) (result *item.BuyOutboundInfo, err errorcode.ErrorCode) {
tt, ok := xmlres.ItemsMAP[int(data.ItemId)]
if ok {
if ok && tt.Price != 0 {
if (data.Count * uint32(tt.Price)) <= c.Info.Coins {
c.Info.Coins -= data.Count * uint32(tt.Price)

Binary file not shown.

View File

@@ -78,12 +78,16 @@ func CalculateRealValue(value int, stat int) int {
func (u *BattlePetEntity) Type() *element.ElementCombination {
var ff *element.ElementCombination
for _, v := range xmlres.PetMAP {
if v.ID == int(u.Info.ID) {
ff, _ = element.NewElementCombination(v.Type)
break
}
}
if ff == nil {
ff, _ = element.NewElementCombination(8)
}
return ff
}

View File

@@ -161,19 +161,35 @@ func (s *SkillEntity) AttackTimeC(level int) {
}
func (s *SkillEntity) CriticalsameTypeBonus() decimal.Decimal {
// 6. 同系加成属性相同则乘以同系加成倍率否则1
// 同系加成默认倍率为1.0
sameTypeBonus := decimal.NewFromFloat(1.0)
if s.Type() == s.Pet.Type() { //使用本系
sameTypeBonus = decimal.NewFromFloat(1.5)
skillType := s.Type()
petType := s.Pet.Type()
// 收集技能的所有属性主属性必存在次属性可能为nil
skillAttrs := []element.ElementType{skillType.Primary}
if skillType.Secondary != nil {
skillAttrs = append(skillAttrs, *skillType.Secondary)
}
stype := s.Type()
ptype := s.Pet.Type()
if stype.Secondary == nil && ptype.Secondary != nil && (stype.Primary == ptype.Primary || stype.Primary == *ptype.Secondary) { //判断技能属性是否是精灵双属性之一
sameTypeBonus = decimal.NewFromFloat(1.5)
// 收集宠物的所有属性主属性必存在次属性可能为nil
petAttrs := []element.ElementType{petType.Primary}
if petType.Secondary != nil {
petAttrs = append(petAttrs, *petType.Secondary)
}
// 检查技能属性与宠物属性是否有任一匹配
for _, sa := range skillAttrs {
for _, pa := range petAttrs {
if sa == pa {
// 存在匹配属性触发1.5倍加成
sameTypeBonus = decimal.NewFromFloat(1.5)
return sameTypeBonus // 一旦匹配,直接返回,避免多余循环
}
}
}
return sameTypeBonus
}

View File

@@ -311,6 +311,7 @@ func (i *Input) CalculatePower(deftype *Input, skill *info.SkillEntity) decimal.
Add(decimal.NewFromInt(2))
var typeRate decimal.Decimal
fmt.Println(skill.Type().ID, deftype.CurrentPet.Type().ID)
t, _ := element.NewElementCalculator().GetOffensiveMultiplier(skill.Type().ID, deftype.CurrentPet.Type().ID)
typeRate = decimal.NewFromFloat(t)

View File

@@ -23,12 +23,13 @@ type ItemListOutboundInfo struct {
}
type GoldOnlineRemainInboundInfo struct {
Head player.TomeeHeader `cmd:"1106" struc:"[0]pad"`
Head player.TomeeHeader `cmd:"1105|1106" struc:"[0]pad"`
}
type GoldOnlineRemainOutboundInfo struct {
// GoldNumber 金豆数量(后端返回实际数量需要*100
GoldNumber uint32 `json:"goldNumber" `
Coin uint32
}
// ExpTotalRemainInboundInfo 累计经验相关的入站信息

View File

@@ -70,7 +70,7 @@ func (s *LoginService) SetServerID(OnlineID uint16, Port uint16) error {
var tttt model.ServerList
record.Struct(&tttt)
//t.Quit(int32(tttt.Port))
_, err = m.Data(&model.ServerList{OnlineID: OnlineID, Port: Port}).Where("online_id", OnlineID).Update()
m.Data(&model.ServerList{OnlineID: OnlineID, Port: Port}).Where("online_id", OnlineID).Update()
return nil

View File

@@ -0,0 +1,730 @@
<Root>
<Relation type="grass">
<Opponent type="grass" multiple="0.5" />
<Opponent type="water" multiple="2" />
<Opponent type="fire" multiple="0.5" />
<Opponent type="flying" multiple="0.5" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="2" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="2" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="0.5" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="water">
<Opponent type="grass" multiple="0.5" />
<Opponent type="water" multiple="0.5" />
<Opponent type="fire" multiple="2" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="2" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="0.5" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="fire">
<Opponent type="grass" multiple="2" />
<Opponent type="water" multiple="0.5" />
<Opponent type="fire" multiple="0.5" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="2" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="2" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="0.5" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="flying">
<Opponent type="grass" multiple="2" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="0.5" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="2" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="0.5" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="0.5" />
<Opponent type="nature" multiple="0.5" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="2" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="electric">
<Opponent type="grass" multiple="0.5" />
<Opponent type="water" multiple="2" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="2" />
<Opponent type="electric" multiple="0.5" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="0" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="2" />
<Opponent type="myth" multiple="0.5" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="2" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="0.5" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="2" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="2" />
</Relation>
<Relation type="steel">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="0.5" />
<Opponent type="fire" multiple="0.5" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="0.5" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="2" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="2" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="0.5" />
<Opponent type="ancient" multiple="2" />
<Opponent type="demon" multiple="2" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="2" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="ground">
<Opponent type="grass" multiple="0.5" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="2" />
<Opponent type="flying" multiple="0" />
<Opponent type="electric" multiple="2" />
<Opponent type="steel" multiple="2" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="0.5" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="0.5" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="0.5" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="0.5" />
<Opponent type="king" multiple="2" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="2" />
<Opponent type="insect" multiple="0.5" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="normal">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="ice">
<Opponent type="grass" multiple="2" />
<Opponent type="water" multiple="0.5" />
<Opponent type="fire" multiple="0.5" />
<Opponent type="flying" multiple="2" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="2" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="0.5" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="2" />
<Opponent type="ancient" multiple="2" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="2" />
<Opponent type="insect" multiple="2" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="psychic">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="0.5" />
<Opponent type="fight" multiple="2" />
<Opponent type="light" multiple="0" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="2" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="2" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="0.5" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="fight">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="2" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="2" />
<Opponent type="psychic" multiple="0.5" />
<Opponent type="fight" multiple="0.5" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="0.5" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="2" />
<Opponent type="saint" multiple="2" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="0.5" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="0.5" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="light">
<Opponent type="grass" multiple="0" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="0.5" />
<Opponent type="psychic" multiple="2" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="0.5" />
<Opponent type="dark" multiple="2" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="0.5" />
<Opponent type="nature" multiple="0.5" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="0.5" />
<Opponent type="insect" multiple="2" />
<Opponent type="void" multiple="0.5" />
</Relation>
<Relation type="dark">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="0.5" />
<Opponent type="psychic" multiple="2" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="0.5" />
<Opponent type="dark" multiple="2" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="2" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="0.5" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="myth">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="2" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="0.5" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="0.5" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="2" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="2" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="0.5" />
<Opponent type="nature" multiple="2" />
<Opponent type="king" multiple="2" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="2" />
<Opponent type="samsara" multiple="2" />
<Opponent type="insect" multiple="0.5" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="dragon">
<Opponent type="grass" multiple="0.5" />
<Opponent type="water" multiple="0.5" />
<Opponent type="fire" multiple="0.5" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="0.5" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="2" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="2" />
<Opponent type="saint" multiple="2" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="0.5" />
<Opponent type="demon" multiple="2" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="0.5" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="saint">
<Opponent type="grass" multiple="2" />
<Opponent type="water" multiple="2" />
<Opponent type="fire" multiple="2" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="2" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="2" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="0.5" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="0.5" />
<Opponent type="dragon" multiple="0.5" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="2" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="0.5" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="2" />
</Relation>
<Relation type="dimension">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="2" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="2" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="0.5" />
<Opponent type="psychic" multiple="2" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="0" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="2" />
<Opponent type="nature" multiple="2" />
<Opponent type="king" multiple="0.5" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="0.5" />
<Opponent type="samsara" multiple="0.5" />
<Opponent type="insect" multiple="2" />
<Opponent type="void" multiple="2" />
</Relation>
<Relation type="ancient">
<Opponent type="grass" multiple="2" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="2" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="0.5" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="2" />
<Opponent type="dragon" multiple="2" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="0.5" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="0.5" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="2" />
</Relation>
<Relation type="demon">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="0.5" />
<Opponent type="psychic" multiple="0.5" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="2" />
<Opponent type="dark" multiple="2" />
<Opponent type="myth" multiple="2" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="2" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="2" />
<Opponent type="king" multiple="0.5" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="0" />
<Opponent type="samsara" multiple="0.5" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="nature">
<Opponent type="grass" multiple="2" />
<Opponent type="water" multiple="2" />
<Opponent type="fire" multiple="2" />
<Opponent type="flying" multiple="2" />
<Opponent type="electric" multiple="2" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="2" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="0.5" />
<Opponent type="fight" multiple="0.5" />
<Opponent type="light" multiple="2" />
<Opponent type="dark" multiple="0.5" />
<Opponent type="myth" multiple="0.5" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="0.5" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="0.5" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="2" />
<Opponent type="chaos" multiple="0.5" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="2" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="0.5" />
</Relation>
<Relation type="king">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="0.5" />
<Opponent type="fight" multiple="2" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="2" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="2" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="2" />
<Opponent type="nature" multiple="0.5" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="0.5" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="chaos">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="2" />
<Opponent type="electric" multiple="0.5" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="2" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="0.5" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="2" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="2" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="2" />
<Opponent type="nature" multiple="2" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="2" />
<Opponent type="samsara" multiple="0.5" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="0" />
</Relation>
<Relation type="deity">
<Opponent type="grass" multiple="2" />
<Opponent type="water" multiple="2" />
<Opponent type="fire" multiple="2" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="2" />
<Opponent type="steel" multiple="0.5" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="2" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="0.5" />
<Opponent type="light" multiple="1" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="0.5" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="2" />
<Opponent type="demon" multiple="2" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="2" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="samsara">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="0.5" />
<Opponent type="psychic" multiple="0.5" />
<Opponent type="fight" multiple="1" />
<Opponent type="light" multiple="2" />
<Opponent type="dark" multiple="2" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="2" />
<Opponent type="dimension" multiple="2" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="2" />
<Opponent type="nature" multiple="0.5" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="2" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="0.5" />
</Relation>
<Relation type="insect">
<Opponent type="grass" multiple="2" />
<Opponent type="water" multiple="0.5" />
<Opponent type="fire" multiple="0.5" />
<Opponent type="flying" multiple="1" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="2" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="0.5" />
<Opponent type="psychic" multiple="1" />
<Opponent type="fight" multiple="2" />
<Opponent type="light" multiple="0.5" />
<Opponent type="dark" multiple="1" />
<Opponent type="myth" multiple="1" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="1" />
<Opponent type="dimension" multiple="1" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="1" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="2" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="1" />
<Opponent type="insect" multiple="2" />
<Opponent type="void" multiple="1" />
</Relation>
<Relation type="void">
<Opponent type="grass" multiple="1" />
<Opponent type="water" multiple="1" />
<Opponent type="fire" multiple="1" />
<Opponent type="flying" multiple="0.5" />
<Opponent type="electric" multiple="1" />
<Opponent type="steel" multiple="1" />
<Opponent type="ground" multiple="1" />
<Opponent type="normal" multiple="1" />
<Opponent type="ice" multiple="1" />
<Opponent type="psychic" multiple="2" />
<Opponent type="fight" multiple="2" />
<Opponent type="light" multiple="2" />
<Opponent type="dark" multiple="0.5" />
<Opponent type="myth" multiple="2" />
<Opponent type="dragon" multiple="1" />
<Opponent type="saint" multiple="0.5" />
<Opponent type="dimension" multiple="0.5" />
<Opponent type="ancient" multiple="1" />
<Opponent type="demon" multiple="1" />
<Opponent type="nature" multiple="2" />
<Opponent type="king" multiple="1" />
<Opponent type="chaos" multiple="1" />
<Opponent type="deity" multiple="1" />
<Opponent type="samsara" multiple="2" />
<Opponent type="insect" multiple="1" />
<Opponent type="void" multiple="1" />
</Relation>
</Root>

View File

@@ -0,0 +1,143 @@
<!--
技能类型
-->
<root>
<item id="1" cn="草" en="grass"/>
<item id="2" cn="水" en="water"/>
<item id="3" cn="火" en="fire"/>
<item id="4" cn="飞行" en="flying"/>
<item id="5" cn="电" en="electric"/>
<item id="6" cn="机械" en="steel"/>
<item id="7" cn="地面" en="ground"/>
<item id="8" cn="普通" en="normal"/>
<item id="9" cn="冰" en="ice"/>
<item id="10" cn="超能" en="psychic"/>
<item id="11" cn="战斗" en="fight"/>
<item id="12" cn="光" en="light"/>
<item id="13" cn="暗影" en="dark"/>
<item id="14" cn="神秘" en="myth"/>
<item id="15" cn="龙" en="dragon"/>
<item id="16" cn="圣灵" en="saint"/>
<item id="17" cn="次元" en="dimension"/>
<item id="18" cn="远古" en="ancient"/>
<item id="19" cn="邪灵" en="demon"/>
<item id="20" cn="自然" en="nature"/>
<item id="21" is_dou="1" att="1 10" cn="草 超能" en="grass_psychic"/>
<item id="22" is_dou="1" att="1 11" cn="草 战斗" en="grass_fight"/>
<item id="23" is_dou="1" att="1 13" cn="草 暗影" en="grass_dark"/>
<item id="24" is_dou="1" att="2 10" cn="水 超能" en="water_psychic"/>
<item id="25" is_dou="1" att="2 13" cn="水 暗影" en="water_dark"/>
<item id="26" is_dou="1" att="2 15" cn="水 龙" en="water_dragon"/>
<item id="27" is_dou="1" att="3 4" cn="火 飞行" en="fire_flying"/>
<item id="28" is_dou="1" att="3 15" cn="火 龙" en="fire_dragon"/>
<item id="29" is_dou="1" att="3 10" cn="火 超能" en="fire_psychic"/>
<item id="30" is_dou="1" att="4 10" cn="飞行 超能" en="flying_psychic"/>
<item id="31" is_dou="1" att="12 4" cn="光 飞行" en="flying_light"/>
<item id="32" is_dou="1" att="4 15" cn="飞行 龙" en="flying_dragon"/>
<item id="33" is_dou="1" att="5 3" cn="电 火" en="electric_fire"/>
<item id="34" is_dou="1" att="5 9" cn="电 冰" en="electric_ice"/>
<item id="35" is_dou="1" att="5 11" cn="电 战斗" en="electric_fight"/>
<item id="36" is_dou="1" att="13 5" cn="暗影 电" en="electric_dark"/>
<item id="37" is_dou="1" att="6 7" cn="机械 地面" en="steel_ground"/>
<item id="38" is_dou="1" att="6 10" cn="机械 超能" en="steel_psychic"/>
<item id="39" is_dou="1" att="6 15" cn="机械 龙" en="steel_dragon"/>
<item id="40" is_dou="1" att="7 15" cn="地面 龙" en="ground_dragon"/>
<item id="41" is_dou="1" att="11 7" cn="战斗 地面" en="ground_fight"/>
<item id="42" is_dou="1" att="7 13" cn="地面 暗影" en="ground_dark"/>
<item id="43" is_dou="1" att="9 15" cn="冰 龙" en="ice_dragon"/>
<item id="44" is_dou="1" att="9 12" cn="冰 光" en="ice_light"/>
<item id="45" is_dou="1" att="9 13" cn="冰 暗影" en="ice_dark"/>
<item id="46" is_dou="1" att="10 9" cn="超能 冰" en="psychic_ice"/>
<item id="47" is_dou="1" att="11 3" cn="战斗 火" en="fight_fire"/>
<item id="48" is_dou="1" att="11 13" cn="战斗 暗影" en="fight_dark"/>
<item id="49" is_dou="1" att="12 14" cn="光 神秘" en="light_myth"/>
<item id="50" is_dou="1" att="13 14" cn="暗影 神秘" en="dark_myth"/>
<item id="51" is_dou="1" att="14 10" cn="神秘 超能" en="myth_psychic"/>
<item id="52" is_dou="1" att="16 12" cn="圣灵 光" en="saint_light"/>
<item id="53" is_dou="1" att="4 14" cn="飞行 神秘" en="flying_myth"/>
<item id="54" is_dou="1" att="7 10" cn="地面 超能" en="ground_psychic"/>
<item id="55" is_dou="1" att="13 15" cn="暗影 龙" en="dark_dragon"/>
<item id="56" is_dou="1" att="16 13" cn="圣灵 暗影" en="saint_dark"/>
<item id="57" is_dou="1" att="18 11" cn="远古 战斗" en="ancient_fight"/>
<item id="58" is_dou="1" att="3 14" cn="火 神秘" en="myth_fire"/>
<item id="59" is_dou="1" att="12 11" cn="光 战斗" en="light_fight"/>
<item id="60" is_dou="1" att="14 11" cn="神秘 战斗" en="myth_fight"/>
<item id="61" is_dou="1" att="17 11" cn="次元 战斗" en="dimension_fight"/>
<item id="62" is_dou="1" att="19 14" cn="邪灵 神秘" en="demon_myth"/>
<item id="63" is_dou="1" att="18 15" cn="远古 龙" en="ancient_dragon"/>
<item id="64" is_dou="1" att="12 17" cn="光 次元" en="light_dimension"/>
<item id="65" is_dou="1" att="18 16" cn="远古 圣灵" en="ancient_saint"/>
<item id="66" is_dou="1" att="2 11" cn="水 战斗" en="water_fight"/>
<item id="67" is_dou="1" att="5 15" cn="电 龙" en="electric_dragon"/>
<item id="68" is_dou="1" att="12 3" cn="光 火" en="light_fire"/>
<item id="69" is_dou="1" att="12 13" cn="光 暗影" en="light_dark"/>
<item id="70" is_dou="1" att="19 15" cn="邪灵 龙" en="demon_dragon"/>
<item id="71" is_dou="1" att="18 14" cn="远古 神秘" en="ancient_myth"/>
<item id="72" is_dou="1" att="6 17" cn="机械 次元" en="steel_dimension"/>
<item id="73" is_dou="1" att="11 15" cn="战斗 龙" en="fight_dragon"/>
<item id="74" is_dou="1" att="11 20" cn="战斗 自然" en="fight_nature"/>
<item id="75" is_dou="1" att="19 6" cn="邪灵 机械" en="demon_steel"/>
<item id="76" is_dou="1" att="5 17" cn="电 次元" en="electric_dimension"/>
<item id="77" is_dou="1" att="18 3" cn="远古 火" en="ancient_fire"/>
<item id="78" is_dou="1" att="16 11" cn="圣灵 战斗" en="saint_fight"/>
<item id="79" is_dou="1" att="16 17" cn="圣灵 次元" en="saint_dimension"/>
<item id="80" is_dou="1" att="16 5" cn="圣灵 电" en="saint_electric"/>
<item id="81" is_dou="1" att="18 7" cn="远古 地面" en="ancient_ground"/>
<item id="82" is_dou="1" att="18 1" cn="远古 草" en="ancient_grass"/>
<item id="83" is_dou="1" att="20 15" cn="自然 龙" en="nature_dragon"/>
<item id="84" is_dou="1" att="9 14" cn="冰 神秘" en="ice_myth"/>
<item id="85" is_dou="1" att="4 13" cn="飞行 暗影" en="flying_dark"/>
<item id="86" is_dou="1" att="9 3" cn="冰 火" en="ice_fire"/>
<item id="87" is_dou="1" att="9 4" cn="冰 飞行" en="ice_flying"/>
<item id="88" is_dou="1" att="20 16" cn="自然 圣灵" en="nature_saint"/>
<item id="89" is_dou="1" att="222 16" cn="混沌 圣灵" en="chaos_saint"/>
<item id="90" is_dou="1" att="18 19" cn="远古 邪灵" en="ancient_demon"/>
<item id="91" is_dou="1" att="20 9" cn="自然 冰" en="nature_ice"/>
<item id="92" is_dou="1" att="222 13" cn="混沌 暗影" en="chaos_dark"/>
<item id="93" is_dou="1" att="222 11" cn="混沌 战斗" en="chaos_fight"/>
<item id="94" is_dou="1" att="222 10" cn="混沌 超能" en="chaos_psychic"/>
<item id="95" is_dou="1" att="16 10" cn="圣灵 超能" en="saint_psychic"/>
<item id="96" is_dou="1" att="222 7" cn="混沌 地面" en="chaos_ground"/>
<item id="97" is_dou="1" att="13 19" cn="暗影 邪灵" en="dark_demon"/>
<item id="98" is_dou="1" att="222 18" cn="混沌 远古" en="chaos_ancient"/>
<item id="99" is_dou="1" att="222 19" cn="混沌 邪灵" en="chaos_demon"/>
<item id="100" is_dou="1" att="16 7" cn="圣灵 地面" en="saint_ground"/>
<item id="101" is_dou="1" att="3 13" cn="火 暗影" en="fire_dark"/>
<item id="102" is_dou="1" att="12 10" cn="光 超能" en="light_psychic"/>
<item id="103" is_dou="1" att="6 11" cn="机械 战斗" en="steel_fight"/>
<item id="104" is_dou="1" att="4 5" cn="飞行 电" en="flying_electric"/>
<item id="105" is_dou="1" att="222 4" cn="混沌 飞行" en="chaos_flying"/>
<item id="106" is_dou="1" att="222 15" cn="混沌 龙" en="chaos_dragon"/>
<item id="107" is_dou="1" att="222 3" cn="混沌 火" en="chaos_fire"/>
<item id="108" is_dou="1" att="16 3" cn="圣灵 火" en="saint_fire"/>
<item id="109" is_dou="1" att="7 14" cn="地面 神秘" en="ground_myth"/>
<item id="110" is_dou="1" att="222 17" cn="混沌 次元" en="chaos_dimension"/>
<item id="111" is_dou="1" att="222 9" cn="混沌 冰" en="chaos_ice"/>
<item id="112" is_dou="1" att="20 14" cn="自然 神秘" en="nature_myth"/>
<item id="113" is_dou="1" att="226 19" cn="虚空 邪灵" en="void_demon"/>
<item id="114" is_dou="1" att="226 222" cn="虚空 混沌" en="void_chaos"/>
<item id="115" is_dou="1" att="16 224" cn="圣灵 轮回" en="saint_samsara"/>
<item id="116" is_dou="1" att="2 17" cn="水 次元" en="water_dimension"/>
<item id="117" is_dou="1" att="16 14" cn="圣灵 神秘" en="saint_myth"/>
<item id="118" is_dou="1" att="6 14" cn="机械 神秘" en="steel_myth"/>
<item id="119" is_dou="1" att="2 14" cn="水 神秘" en="water_myth"/>
<item id="120" is_dou="1" att="17 15" cn="次元 龙" en="dimension_dragon"/>
<item id="121" is_dou="1" att="20 10" cn="自然 超能" en="nature_psychic"/>
<item id="122" is_dou="1" att="5 6" cn="电 机械" en="electric_steel"/>
<item id="123" is_dou="1" att="14 224" cn="神秘 轮回" en="myth_samsara"/>
<item id="124" is_dou="1" att="2 6" cn="水 机械" en="water_steel"/>
<item id="125" is_dou="1" att="3 6" cn="火 机械" en="fire_steel"/>
<item id="126" is_dou="1" att="1 6" cn="草 机械" en="grass_steel"/>
<item id="127" is_dou="1" att="18 5" cn="远古 电" en="ancient_electric"/>
<item id="128" is_dou="1" att="16 4" cn="圣灵 飞行" en="saint_flying"/>
<item id="221" cn="王" en="king"/>
<item id="222" cn="混沌" en="chaos"/>
<item id="223" cn="神灵" en="deity"/>
<item id="224" cn="轮回" en="samsara"/>
<item id="225" cn="虫" en="insect"/>
<item id="226" cn="虚空" en="void"/>
</root>