Browse Source

配置更新。

huangjinghao 1 tháng trước cách đây
mục cha
commit
11487f36bc

+ 4 - 4
GameConfig/CFG.check

@@ -1,6 +1,6 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:1511108716
 D:\git\newWork\Config\GameConfig\M_monster.xls:1846396672
-D:\git\newWork\Config\GameConfig\M_i18n.xls:-2146822812
+D:\git\newWork\Config\GameConfig\M_i18n.xls:1797769440
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
 D:\git\newWork\Config\GameConfig\M_vip_config.xls:1878630432
@@ -10,8 +10,8 @@ D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-124973679
 D:\git\newWork\Config\GameConfig\M_shop.xls:-598498963
 D:\git\newWork\Config\GameConfig\M_item.xls:129860324
 D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:-1309863969
-D:\git\newWork\Config\GameConfig\M_Global_Config.xls:359064959
-D:\git\newWork\Config\GameConfig\M_hero.xls:1200156844
+D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-532862181
+D:\git\newWork\Config\GameConfig\M_hero.xls:-988740727
 D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
-D:\git\newWork\Config\GameConfig\M_skill.xls:1202238008
+D:\git\newWork\Config\GameConfig\M_skill.xls:-399805309
 D:\git\newWork\Config\GameConfig\M_test.xls:444037689

+ 1 - 1
GameConfig/Lua/M_Global_Config.lua

@@ -20,7 +20,7 @@ function M_Global_Config:init()
 	self.datas["TreasureChestProbability"] = {Key = "TreasureChestProbability", Desc = "魔导石宝箱  奖励概率(万分比)", IntValue = nil, IntListValue = {5000,2500,2500}, StrValue = "", StrListValue = {}, BoolValue = nil}
 	self.datas["SuperTriggered"] = {Key = "SuperTriggered", Desc = "鱼阵时间触发 基础间隔,随机偏移", IntValue = nil, IntListValue = {60,20}, StrValue = "", StrListValue = {}, BoolValue = nil}
 	self.datas["Death"] = {Key = "Death", Desc = "主角受击次数死亡", IntValue = 5, IntListValue = {}, StrValue = "", StrListValue = {}, BoolValue = nil}
-	self.datas["MonsterRefresh"] = {Key = "MonsterRefresh", Desc = "刷怪圈(外圈直径,内圈直径)", IntValue = nil, IntListValue = {30,20}, StrValue = "", StrListValue = {}, BoolValue = nil}
+	self.datas["MonsterRefresh"] = {Key = "MonsterRefresh", Desc = "刷怪圈(外圈直径,内圈直径)", IntValue = nil, IntListValue = {900,600}, StrValue = "", StrListValue = {}, BoolValue = nil}
 	self.datas["Experience1"] = {Key = "Experience1", Desc = "道具ID:5 提供的经验值", IntValue = 10, IntListValue = {}, StrValue = "", StrListValue = {}, BoolValue = nil}
 	self.datas["Experience2"] = {Key = "Experience2", Desc = "道具ID:6 提供的经验值", IntValue = 20, IntListValue = {}, StrValue = "", StrListValue = {}, BoolValue = nil}
 end

+ 1 - 0
GameConfig/Lua/M_i18n.lua

@@ -62,6 +62,7 @@ function M_i18n:init()
 	self.datas["3000029"] = {ID = "3000029", zh = "正在获取用户信息...", en = "Get Role Info..."}
 	self.datas["3000030"] = {ID = "3000030", zh = "正在进入游戏...", en = "Enter Game..."}
 	self.datas["3000031"] = {ID = "3000031", zh = "未解锁", en = "Lock"}
+	self.datas["3000032"] = {ID = "3000032", zh = "功能开发中", en = "Function Working"}
 end
 
 M_i18n:init()

+ 4 - 4
GameConfig/Lua/M_skill.lua

@@ -9,10 +9,10 @@ end
 
 function M_skill:init()
 	self.datas = {}
-	self.datas[1001] = {ID = 1001, hero_id = 1001, skill_leve = 1, bullet_num = 1, bullet_radius = 2, attack_distance = 10, skill_des = "扔出1把旋转大刀"}
-	self.datas[1002] = {ID = 1002, hero_id = 1001, skill_leve = 2, bullet_num = 2, bullet_radius = 2, attack_distance = 10, skill_des = "扔出2把旋转大刀"}
-	self.datas[1003] = {ID = 1003, hero_id = 1001, skill_leve = 3, bullet_num = 4, bullet_radius = 2, attack_distance = 10, skill_des = "扔出4把旋转大刀"}
-	self.datas[1004] = {ID = 1004, hero_id = 1001, skill_leve = 4, bullet_num = 8, bullet_radius = 2, attack_distance = 10, skill_des = "扔出8把旋转大刀"}
+	self.datas[1001] = {ID = 1001, hero_id = 1001, skill_leve = 1, bullet_num = 1, bullet_radius = 200, attack_distance = 1000, skill_des = "扔出1把旋转大刀"}
+	self.datas[1002] = {ID = 1002, hero_id = 1001, skill_leve = 2, bullet_num = 2, bullet_radius = 200, attack_distance = 1000, skill_des = "扔出2把旋转大刀"}
+	self.datas[1003] = {ID = 1003, hero_id = 1001, skill_leve = 3, bullet_num = 4, bullet_radius = 200, attack_distance = 1000, skill_des = "扔出4把旋转大刀"}
+	self.datas[1004] = {ID = 1004, hero_id = 1001, skill_leve = 4, bullet_num = 8, bullet_radius = 200, attack_distance = 1000, skill_des = "扔出8把旋转大刀"}
 end
 
 M_skill:init()

BIN
GameConfig/M_i18n.xls


+ 1 - 1
GameConfig/Xml/M_Global_Config.xml

@@ -11,7 +11,7 @@
 	<Data Key="TreasureChestProbability" Desc="魔导石宝箱  奖励概率(万分比)" IntValue="" IntListValue="5000,2500,2500" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="SuperTriggered" Desc="鱼阵时间触发 基础间隔,随机偏移" IntValue="" IntListValue="60,20" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="Death" Desc="主角受击次数死亡" IntValue="5" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
-	<Data Key="MonsterRefresh" Desc="刷怪圈(外圈直径,内圈直径)" IntValue="" IntListValue="30,20" StrValue="" StrListValue="" BoolValue="" />
+	<Data Key="MonsterRefresh" Desc="刷怪圈(外圈直径,内圈直径)" IntValue="" IntListValue="900,600" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="Experience1" Desc="道具ID:5 提供的经验值" IntValue="10" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="Experience2" Desc="道具ID:6 提供的经验值" IntValue="20" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
 </Root>

+ 1 - 0
GameConfig/Xml/M_i18n.xml

@@ -53,4 +53,5 @@
 	<Data ID="3000029" zh="正在获取用户信息..." en="Get Role Info..." />
 	<Data ID="3000030" zh="正在进入游戏..." en="Enter Game..." />
 	<Data ID="3000031" zh="未解锁" en="Lock" />
+	<Data ID="3000032" zh="功能开发中" en="Function Working" />
 </Root>

+ 4 - 4
GameConfig/Xml/M_skill.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data ID="1001" hero_id="1001" skill_leve="1" bullet_num="1" bullet_radius="2" attack_distance="10" skill_des="扔出1把旋转大刀" />
-	<Data ID="1002" hero_id="1001" skill_leve="2" bullet_num="2" bullet_radius="2" attack_distance="10" skill_des="扔出2把旋转大刀" />
-	<Data ID="1003" hero_id="1001" skill_leve="3" bullet_num="4" bullet_radius="2" attack_distance="10" skill_des="扔出4把旋转大刀" />
-	<Data ID="1004" hero_id="1001" skill_leve="4" bullet_num="8" bullet_radius="2" attack_distance="10" skill_des="扔出8把旋转大刀" />
+	<Data ID="1001" hero_id="1001" skill_leve="1" bullet_num="1" bullet_radius="200" attack_distance="1000" skill_des="扔出1把旋转大刀" />
+	<Data ID="1002" hero_id="1001" skill_leve="2" bullet_num="2" bullet_radius="200" attack_distance="1000" skill_des="扔出2把旋转大刀" />
+	<Data ID="1003" hero_id="1001" skill_leve="3" bullet_num="4" bullet_radius="200" attack_distance="1000" skill_des="扔出4把旋转大刀" />
+	<Data ID="1004" hero_id="1001" skill_leve="4" bullet_num="8" bullet_radius="200" attack_distance="1000" skill_des="扔出8把旋转大刀" />
 </Root>

+ 1 - 1
GameConfig/json/M_Global_Config.json

@@ -20,7 +20,7 @@
 
 ,"Death":{"Key":"Death","Desc":"主角受击次数死亡","IntValue":5,"IntListValue":[],"StrValue":"","StrListValue":[],"BoolValue":false}
 
-,"MonsterRefresh":{"Key":"MonsterRefresh","Desc":"刷怪圈(外圈直径,内圈直径)","IntValue":0,"IntListValue":[30,20],"StrValue":"","StrListValue":[],"BoolValue":false}
+,"MonsterRefresh":{"Key":"MonsterRefresh","Desc":"刷怪圈(外圈直径,内圈直径)","IntValue":0,"IntListValue":[900,600],"StrValue":"","StrListValue":[],"BoolValue":false}
 
 ,"Experience1":{"Key":"Experience1","Desc":"道具ID:5 提供的经验值","IntValue":10,"IntListValue":[],"StrValue":"","StrListValue":[],"BoolValue":false}
 

+ 2 - 0
GameConfig/json/M_i18n.json

@@ -104,4 +104,6 @@
 
 ,"3000031":{"ID":"3000031","zh":"未解锁","en":"Lock"}
 
+,"3000032":{"ID":"3000032","zh":"功能开发中","en":"Function Working"}
+
 }

+ 4 - 4
GameConfig/json/M_skill.json

@@ -1,9 +1,9 @@
-{"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出1把旋转大刀"}
+{"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出1把旋转大刀"}
 
-,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出2把旋转大刀"}
+,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出2把旋转大刀"}
 
-,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出4把旋转大刀"}
+,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出4把旋转大刀"}
 
-,"1004":{"ID":1004,"hero_id":1001,"skill_leve":4,"bullet_num":8,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出8把旋转大刀"}
+,"1004":{"ID":1004,"hero_id":1001,"skill_leve":4,"bullet_num":8,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出8把旋转大刀"}
 
 }

+ 1 - 1
GameConfig/ts/M_Global_Config.ts

@@ -24,7 +24,7 @@ export default class M_Global_Config {
 
       ,"Death":{"Key":"Death","Desc":"主角受击次数死亡","IntValue":5,"IntListValue":[],"StrValue":"","StrListValue":[],"BoolValue":false}
 
-      ,"MonsterRefresh":{"Key":"MonsterRefresh","Desc":"刷怪圈(外圈直径,内圈直径)","IntValue":0,"IntListValue":[30,20],"StrValue":"","StrListValue":[],"BoolValue":false}
+      ,"MonsterRefresh":{"Key":"MonsterRefresh","Desc":"刷怪圈(外圈直径,内圈直径)","IntValue":0,"IntListValue":[900,600],"StrValue":"","StrListValue":[],"BoolValue":false}
 
       ,"Experience1":{"Key":"Experience1","Desc":"道具ID:5 提供的经验值","IntValue":10,"IntListValue":[],"StrValue":"","StrListValue":[],"BoolValue":false}
 

+ 2 - 0
GameConfig/ts/M_i18n.ts

@@ -108,6 +108,8 @@ export default class M_i18n {
 
       ,"3000031":{"ID":"3000031","zh":"未解锁","en":"Lock"}
 
+      ,"3000032":{"ID":"3000032","zh":"功能开发中","en":"Function Working"}
+
       }// ID:参数编号, zh:中文, en:英文
 
 

+ 4 - 4
GameConfig/ts/M_skill.ts

@@ -2,13 +2,13 @@
 
 export default class M_skill {
   private static data =
-      {"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出1把旋转大刀"}
+      {"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出1把旋转大刀"}
 
-      ,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出2把旋转大刀"}
+      ,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出2把旋转大刀"}
 
-      ,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出4把旋转大刀"}
+      ,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出4把旋转大刀"}
 
-      ,"1004":{"ID":1004,"hero_id":1001,"skill_leve":4,"bullet_num":8,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出8把旋转大刀"}
+      ,"1004":{"ID":1004,"hero_id":1001,"skill_leve":4,"bullet_num":8,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出8把旋转大刀"}
 
       }// ID:ID, hero_id:英雄ID, skill_leve:技能等级, bullet_num:子弹数量, bullet_radius:子弹半径, attack_distance:攻击距离, skill_des:技能描述