配置（充值）修改

Assets/Content/Config/GlobalCfg.csv

@@ -236,7 +236,7 @@ int,string,int,string,float
 241,邀请等级限制,30,,
 242,学员上限,40,,
 243,反伤效果受击特效,10024,,
-244,储值神域经验转化比例,,1:10,
+244,充值神域经验转化比例,,1:10,
 245,卢恩商城版本更新重置商品(礼包ID:需重置+1),,100:0;101:0;102:0;103:0;104:0,
 246,问卷调查,,https://www.wenjuan.com/s/UZBZJveyIK/,
 247,问卷调查奖励,,2:100;110:3;115:10,
@@ -280,7 +280,7 @@ int,string,int,string,float
 291,公会战虚弱复活时长,20,,
 292,公会每日踢人上限次数,50,,
 293,创角邮件奖励,,0.152777778,
-294,玩家累计储值金额,,500;501,
+294,玩家累计充值金额,,500;501,
 295,公会战挑战次数购买花费,,2:10000,
 296,公会战买活花费,,2:10000,
 297,恶意私聊封号条件,,30;40;5;3;30,
@@ -337,14 +337,14 @@ int,string,int,string,float
 350,宠物契约槽位解锁消耗,,264:1;264:1;264:1;264:1,
 351,宠物契约相同属性额外继承属性比例,200,,
 352,卡片转移消耗（2=1级与2级互换，3=2级与3级互换；跨等级互换=跨越等级需要道具之和，1级4级互换=2+3+4）,,2:268:10;3:268:20;4:268:60;5:268:180,
-353,免费储值额度神域经验比例,,1:10,
+353,免费充值额度神域经验比例,,1:10,
 354,无特权今日可用免费额度上限,500,,
 355,限时战斗倍速体验卡持续时间,,20003:900,
 356,1元人民币兑换RO币,,1:10,
-357,试炼馈赠（层数：免费储值额度数量）,,10:50;150:150;300:175;450:200;600:225;750:250;900:275;1050:300;1200:325;1350:350;1500:375;1600:400;1700:425;1800:450;1900:475;2000:500,
+357,试炼馈赠（层数：免费充值额度数量）,,10:50;150:150;300:175;450:200;600:225;750:250;900:275;1050:300;1200:325;1350:350;1500:375;1600:400;1700:425;1800:450;1900:475;2000:500,
 358,RO币兑换波利商城经验比例,,1:01,
-359,免费储值额度动画飘动数量,7,,
-360,波利商城解锁条件（储值￥),50,,
-361,储值钱包返回后的关卡及引导id,,10001:20,
+359,免费充值额度动画飘动数量,7,,
+360,波利商城解锁条件（充值￥),50,,
+361,充值钱包返回后的关卡及引导id,,10001:20,
 362,挑战者大厅购买次数消耗,,2:50000;2:60000;2:80000;2:100000;2:120000;2:150000,
 363,最大关卡ID,580100,,

Assets/Content/Config/LanguagePackage_cn.csv

@@ -9946,7 +9946,7 @@ BoliVipDesc14,<color={0}>商店新增<color={1}>卡片转移水晶等道具产
 BoliVipDesc15,<color={0}>商店新增<color={1}>稀有道具产出</color></color>
 BoliVipDesc16,<color={0}>商店新增<color={1}>6级特权可购买道具</color></color>
 TitleReturnGift,赠送回归套装
-RechargeWalletRule,1.玩家可在充值钱包中提取免费充值额度，购买金币\n2.免费充值额度可在试炼之塔、主线关卡、百人道场、挂机宝箱中获取，存入充值钱包中\n3.充值钱包将在每日5:00清空免费充值额度\n4.每日可提取的免费充值额度有上限，特权卡可永久提升上限\n5.礼金兑换累计充值奖励时：\n1礼金=0.14￥ 30礼金=4.2￥ 98礼金=13.72￥\n128礼金=17.92￥ 328礼金=45.92￥ 648礼金=90.72￥\n1000礼金=140￥ 2000礼金=280￥ 5000礼金=700￥
+RechargeWalletRule,1.玩家可在充值钱包中提取免费充值额度，购买金币\n2.免费充值额度可在试炼之塔、主线关卡、百人道场、挂机宝箱中获取，存入充值钱包中\n3.充值钱包将在每日5:00清空免费充值额度\n4.每日可提取的免费充值额度有上限，特权卡可永久提升上限\n
 ShopLv,商城等级
 PrivilegeGift,特权礼包
 ShopUpgrade,波利商城升级

Assets/Content/Config/LevelCfg.csv

@@ -1,4 +1,4 @@
-唯一id,场景id,地图id,场景顺序,场景类型,场景名字,在线base经验,在线伙伴经验,在线银币,技能经验,在线金币,在线魔魂值,在线掉落包ID,活动掉落ID,通关base经验,通关job经验,通关银币,通关金币,通关伙伴经验,活动通关现金,通关公会活跃,通关掉落包ID,掉落地上的持续时间（秒）,bossId,是否播放动画,UI显示时间,boss出场总时长,boss站位,boss出生点,路径,BOSS死亡延时,小怪死亡延时,BOSS狂暴buffid,怪物等级,BOSS挑战等级,boss战小怪,巡游前剧情ID,剧情索引ID,BOSS战斗音效,关卡攻略,里程积分,通关免费储值额度
+唯一id,场景id,地图id,场景顺序,场景类型,场景名字,在线base经验,在线伙伴经验,在线银币,技能经验,在线金币,在线魔魂值,在线掉落包ID,活动掉落ID,通关base经验,通关job经验,通关银币,通关金币,通关伙伴经验,活动通关现金,通关公会活跃,通关掉落包ID,掉落地上的持续时间（秒）,bossId,是否播放动画,UI显示时间,boss出场总时长,boss站位,boss出生点,路径,BOSS死亡延时,小怪死亡延时,BOSS狂暴buffid,怪物等级,BOSS挑战等级,boss战小怪,巡游前剧情ID,剧情索引ID,BOSS战斗音效,关卡攻略,里程积分,通关免费充值额度
 Id,LevelId,MapId,Turn,LevelType,Name,BaseExpOl,ParterOl,ZenyOl,CruiseOl,GoldOl,EvilOl,DropOl,HdDrop,BaseExp,JobExp,Zeny,Gold,Parter,Cash,GuildActive,Drop,DropTime,BossId,BossAnimation,UiShowTime,BossAnimationTime,BossPosition,BossBorn,PathList,BossDeadDelay,MonsterDeadDelay,BossRageBuffId,MonsterLv,FightLv,Monsters,DlgId,DlgContentId,BattleBgm,BossKey,MapScore,FreeInvest
 int,int,int,int,int,string,int,int,int,int,int,int,list,list,int,int,int,int,int,int,int,list,float,int,int,float,float,int,int,string,float,float,int,int,int,list,int,int,string,string,int,int
 10001,1,1,1,1,普隆德拉南门1,1340,768,1448,120,0,12,10000:501;10000:9001,,1000,30,280,5,540,10,,10000:503;10000:9015,1.0,90000001,1,2.7,4.5,5,0,0;2;23;4;24;6;25;8;26;10;27;12;28;14;16;29;18;30;20;22;1;32;3;5;33;7;9;34;11;13;15;17;35;19;36;21,1.4,1.5,99990,1,1,,2,1,Fight_01,,1,10

Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -119,8 +119,24 @@ public class CheckHotUpdateRes : EditorWindow
         GUILayout.BeginHorizontal();
         GUILayout.Space(10);
         GUILayout.Label("资源版本：", GUILayout.Width(65));
+      
         GUILayout.Space(10);
         info.ResVersion = GUILayout.TextField(info.ResVersion, GUILayout.Width(160));
+        GUILayout.Space(10);
+
+        if (GUILayout.Button("读取版本", GUILayout.Width(100)))
+        {
+            info.ResVersion = File.ReadAllText($"{info.OldPath}/{info.VersionFileName}");
+        }
+        GUILayout.Space(10);
+
+        if (GUILayout.Button("版本+1", GUILayout.Width(100)))
+        {
+            VersionCode lVersionCode = info.ResVersion;
+            lVersionCode.patch += 1;
+            info.ResVersion = lVersionCode.ToString();
+        }
+        GUILayout.Space(10);
 
         GUILayout.EndHorizontal();
 

Assets/Lua/Config/ActivitiesDiscountsCfg.lua

@@ -4678,8 +4678,8 @@ local ActivitiesDiscountsCfg = {
     [335]={
     ['Id']=335,
     ['ProductID']=168,
-    ['Name']='超值0.99$礼包',
-    ['TriggeringCondition']={{16,0.99}},
+    ['Name']='超值6元礼包',
+    ['TriggeringCondition']={{16,6}},
     ['Money']=6,
     ['Reward']={{687,1},{1,100000}},
     ['Time']=43200,
@@ -4692,8 +4692,8 @@ local ActivitiesDiscountsCfg = {
     [336]={
     ['Id']=336,
     ['ProductID']=168,
-    ['Name']='超值0.99$礼包',
-    ['TriggeringCondition']={{16,0.99}},
+    ['Name']='超值6元礼包',
+    ['TriggeringCondition']={{16,6}},
     ['Money']=6,
     ['Reward']={{687,1},{1,100000}},
     ['Time']=43200,
@@ -4706,8 +4706,8 @@ local ActivitiesDiscountsCfg = {
     [337]={
     ['Id']=337,
     ['ProductID']=169,
-    ['Name']='超值14.99$礼包',
-    ['TriggeringCondition']={{16,14.99}},
+    ['Name']='超值98元礼包',
+    ['TriggeringCondition']={{16,98}},
     ['Money']=98,
     ['Reward']={{701,5},{513,1},{1,1000000}},
     ['Time']=43200,
@@ -4720,8 +4720,8 @@ local ActivitiesDiscountsCfg = {
     [338]={
     ['Id']=338,
     ['ProductID']=169,
-    ['Name']='超值14.99$礼包',
-    ['TriggeringCondition']={{16,14.99}},
+    ['Name']='超值98元礼包',
+    ['TriggeringCondition']={{16,98}},
     ['Money']=98,
     ['Reward']={{701,5},{513,1},{1,1000000}},
     ['Time']=43200,

Assets/Lua/Config/DesignationCfg.lua

@@ -86,8 +86,8 @@ local DesignationCfg = {
 ['Sort']=1,
 ['Type']=2,
 ['Attribute']={{21,12}},
-['TaskCondition']={{79,9}}, --100
-['TaskConditionDesc']='一天内累计储值9$ （五点重置进度）',
+['TaskCondition']={{79,100}}, --100
+['TaskConditionDesc']='一天内累计充值100 （五点重置进度）',
 ['IfShowTaskNum']=1,
 ['Time']=0,
 ['TimeDesc']='永久时效',
@@ -102,8 +102,8 @@ local DesignationCfg = {
 ['Sort']=2,
 ['Type']=2,
 ['Attribute']={{21,20}},
-['TaskCondition']={{79,99}},---1000
-['TaskConditionDesc']='一天内累计储值99$（五点重置进度）',
+['TaskCondition']={{79,1000}},---1000
+['TaskConditionDesc']='一天内累计充值1000（五点重置进度）',
 ['IfShowTaskNum']=1,
 ['Time']=0,
 ['TimeDesc']='永久时效',
@@ -118,8 +118,8 @@ local DesignationCfg = {
 ['Sort']=3,
 ['Type']=2,
 ['Attribute']={{21,32}},
-['TaskCondition']={{79,1199}},--10000
-['TaskConditionDesc']='一天内累计储值1199$（五点重置进度）',
+['TaskCondition']={{79,10000}},--10000
+['TaskConditionDesc']='一天内累计充值10000（五点重置进度）',
 ['IfShowTaskNum']=1,
 ['Time']=0,
 ['TimeDesc']='永久时效',

Assets/Lua/Config/InvitationTaskCfg.lua

@@ -27,7 +27,7 @@ local InvitationTaskCfg = {
 ['TaskId']=4,
 ['TaskCondition']={{55,60,1}},
 ['Reward']={{25,100}},
-['Title']='1个学员储值60',
+['Title']='1个学员充值60',
 ['Desc']='',
 ['CompleteNum']=2,
 },
@@ -35,7 +35,7 @@ local InvitationTaskCfg = {
 ['TaskId']=5,
 ['TaskCondition']={{56,1000,1}},
 ['Reward']={{25,100}},
-['Title']='1个学员储值1000',
+['Title']='1个学员充值1000',
 ['Desc']='',
 ['CompleteNum']=1,
 },

Assets/Lua/Config/ItemCfg1.lua

@@ -778,7 +778,7 @@ local ItemCfg1 = {
 },
 [53]={
 ['Id']=53,
-['Name']='免费储值额度',
+['Name']='免费充值额度',
 ['ResType']=53,
 ['Quality']=5,
 ['Composition']=0,
@@ -788,7 +788,7 @@ local ItemCfg1 = {
 ['Icon']='Items/item_freeinvest',
 ['MiniIcon']='Common/ic_res_freeinvest',
 ['Job']=0,
-['Describe']='用于在储值钱包购买商品（获取途径：试炼之塔，主线关卡，挂机宝箱）',
+['Describe']='用于在充值钱包购买商品（获取途径：试炼之塔，主线关卡，挂机宝箱）',
 ['ItemTime']=0,
 ['SkipInterface']=0,
 ['DebrisShow']=0,
@@ -809,7 +809,7 @@ local ItemCfg1 = {
 ['Icon']='Items/item_ro',
 ['MiniIcon']='Common/ic_res_ro',
 ['Job']=0,
-['Describe']='RO币（获取途径：储值）',
+['Describe']='RO币（获取途径：充值）',
 ['ItemTime']=0,
 ['SkipInterface']=0,
 ['DebrisShow']=0,
@@ -2331,7 +2331,7 @@ local ItemCfg1 = {
 ['Icon']='Items/item_noviciate',
 ['MiniIcon']='Common/ic_res_noviciate',
 ['Job']=0,
-['Describe']='可用于新区嘉年华中兑换道具，活动结束后自动消失（获取途径：参与累积储值活动可获取礼券）',
+['Describe']='可用于新区嘉年华中兑换道具，活动结束后自动消失（获取途径：参与累积充值活动可获取礼券）',
 ['ItemTime']=5,
 ['SkipInterface']=27,
 ['DebrisShow']=0,
@@ -9660,7 +9660,7 @@ local ItemCfg1 = {
 ['Icon']='Items/item_expjob',
 ['MiniIcon']='',
 ['Job']=0,
-['Describe']='累储补偿道具，领取后增加对应储值金额',
+['Describe']='累储补偿道具，领取后增加对应充值金额',
 ['ItemTime']=0,
 ['SkipInterface']=0,
 ['DebrisShow']=0,

Assets/Lua/Config/ItemCfg2.lua

@@ -7514,7 +7514,7 @@ local ItemCfg2 = {
     },
     [20001] = {
         ['Id'] = 20001,
-        ['Name'] = '免费储值额度',
+        ['Name'] = '免费充值额度',
         ['ResType'] = 16,
         ['Quality'] = 5,
         ['Composition'] = 9999,
@@ -7526,7 +7526,7 @@ local ItemCfg2 = {
         ['Job'] = 0,
         ['ComposeItem'] = { 9002 },
         ['Resolve'] = { 9002 },
-        ['Describe'] = '用于在储值钱包购买商品（获取途径：试炼之塔，主线关卡，挂机宝箱）',
+        ['Describe'] = '用于在充值钱包购买商品（获取途径：试炼之塔，主线关卡，挂机宝箱）',
         ['ItemTime'] = 0,
         ['SkipInterface'] = 0,
         ['DebrisShow'] = 0,

Assets/Lua/Config/NoticeCfg.lua

@@ -5,7 +5,7 @@ local NoticeCfg = {
 ['NoticeTitle']='《仙境传说：初心者大冒险》先锋测试',
 ['NoticeBeginTime']='2020-09-23 00:00:00',
 ['NoticeEndTime']='2020-10-29 00:00:00',
-['NoticeTxt']='《仙境传说：初心者大冒险》将于9月29日11点开启先锋测试。\n\n本次测试为内部测试版本，请各位先锋团成员注意信息保密，部分内容还在优化调整期，非代表最终上线品质，也希望大家能多提意见建议。\n\n本次版本无储值，会通过邮件定期发放福利，测试结束时间未定，请留意群公告信息。',
+['NoticeTxt']='《仙境传说：初心者大冒险》将于9月29日11点开启先锋测试。\n\n本次测试为内部测试版本，请各位先锋团成员注意信息保密，部分内容还在优化调整期，非代表最终上线品质，也希望大家能多提意见建议。\n\n本次版本无充值，会通过邮件定期发放福利，测试结束时间未定，请留意群公告信息。',
 ['BigBanner']='',
 ['SmallBanner']='',
 ['BannerEject']=0,

Assets/Lua/Config/UIFuncUnLockCfg.lua

@@ -1584,8 +1584,8 @@ local UIFuncUnLockCfg = {
 ['LockNotice']='',
 ['FunIcon']='',
 ['FunName']='Fun78',
-['FunDsc']='储值钱包',
-['LockDsc']='储值钱包',
+['FunDsc']='充值钱包',
+['LockDsc']='充值钱包',
 ['NeedLock']=true,
 ['NeedMask']=false,
 ['NeedNotify']=false,

Assets/Lua/Config/UIJumpCfg.lua

@@ -244,7 +244,7 @@ local UIJumpCfg = {
 ['PanelData']={117},
 ['UIFuncUnLock']=0,
 ['MainPanelId']=0,
-['Describe']='卢恩商会储值界面',
+['Describe']='卢恩商会充值界面',
 },
 [32]={
 ['Id']=32,