Commit Graph

469 Commits (73588be932f244967051cb9441a2e2a98b8aa3c4)

Author SHA1 Message Date
ZhangBiao 8269afe74d 【踏碎凌霄】回访 2021-04-26 16:53:36 +08:00
ZhangBiao 98f12190ea 【踏碎凌霄】 2021-04-26 16:46:03 +08:00
ZhangBiao 31b9eb3057 【踏碎凌霄】 2021-04-26 16:20:22 +08:00
ZhangBiao b0d0fab6d5 【踏碎凌霄】提交 2021-04-26 10:23:19 +08:00
ZhangBiao 39329ce5cc 【踏碎凌霄提交】 2021-04-25 15:07:36 +08:00
ZhangBiao 2df3ac159c 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00
wangzhenxing bf6d29d677 【ID1008678】
【战斗统计优化】战斗统计中关卡敌人显示具体的星级和品质边框
2021-04-19 16:08:15 +08:00
jiaoyangna 92104541fc Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller.meta
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-04-16 15:42:39 +08:00
gaoxin 8eb6c30d95 【战斗】战斗开始时清除轮转方法,(伏虎罗汉无限攻击的bug) 2021-04-15 19:05:01 +08:00
gaoxin e013f396b3 【引导战斗】所有剧情放到战斗里 2021-04-13 15:10:40 +08:00
gaoxin c338637ddc 【引导战斗】新的内容 2021-04-12 18:11:37 +08:00
gaoxin f56c620709 【假战斗】添加先后手配置 2021-04-12 18:10:39 +08:00
wangzhenxing 450e2b412b [战斗]==================同步最新被动逻辑 2021-04-10 21:58:27 +08:00
JieLing ea7282bbbb Merge branch 'xma/dev' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-04-10 17:23:38 +08:00
ZhangBiao 385e107b75 【boss来袭】越南语BOSS展示显示中文修复 2021-04-10 13:30:32 +08:00
jiaoyangna 071a91773a 导出 文本提交 2021-04-09 12:26:35 +08:00
jiaoyangna 0ab7c3177a 还原文字提交 2021-04-09 12:06:17 +08:00
zhangqiang 3bd507747e 【车迟斗法】车迟斗法倒计时不是在战斗结束开始计算 2021-04-09 10:57:31 +08:00
wangzhenxing d19f1cce1c [战斗]=====被动214,238修改 bug:1014491 1013881 2021-04-08 21:09:29 +08:00
gaoxin 3ccf1e6c44 【语音】添加是否播放游戏语音的控制字段 2021-04-08 17:32:40 +08:00
wangzhenxing dada859ec6 [战斗]========battleutil 添加判断数组长度方法 2021-04-07 20:14:43 +08:00
ZhangBiao bfaa5195b5 Revert "【表删除】报错处理"
This reverts commit b163fc3035.
2021-04-07 11:54:39 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin b163fc3035 【表删除】报错处理 2021-04-06 15:16:37 +08:00
gaoxin 1a4c96e88d Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Framework/Framework.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	data_execl/Language_data/LanguageLua.csv
#	data_execl/Language_data/LanguageText.csv
2021-04-02 11:34:27 +08:00
gaoxin 68493d2b60 【本地化】还原文本 2021-04-01 18:45:39 +08:00
gaoxin b53717c9ee 【本地化】还原文本 2021-04-01 18:41:50 +08:00
gaoxin cbb28ebeae 【本地化】文本导出 2021-04-01 18:36:34 +08:00
wangzhenxing acfe38c973 [战斗]==========被动263 被动168修改 2021-04-01 17:11:54 +08:00
wangzhenxing 1a3086a2e3 【战斗】==============被动168 修改 bugId: 1014123 2021-03-30 20:33:39 +08:00
gaoxin 81a87576a3 【战斗】修复敌方灵兽数据判断错误,我方没有灵兽时会导致敌方灵兽消失 2021-03-30 17:44:44 +08:00
gaoxin 59fdb6d2aa Merge remote-tracking branch 'origin/xma/dev' into master_xma_local 2021-03-30 17:43:39 +08:00
gaoxin 1689489c3c 【战斗】修复敌方灵兽数据判断错误,我方没有灵兽时会导致敌方灵兽消失 2021-03-30 17:43:22 +08:00
wangzhenxing 33852141c6 【战斗】============被动245 去除 是不是追加技能得判断 2021-03-30 17:27:37 +08:00
gaoxin 03da04762b Merge remote-tracking branch 'origin/xma/dev' into master_xma_local 2021-03-30 17:26:16 +08:00
gaoxin 187ec35fbd 【GM】修改获取战斗数据的GM服务器地址 2021-03-30 17:25:03 +08:00
wangzhenxing cda352d46e 【战斗】==========选择对位目标逻辑修改 2021-03-30 17:17:10 +08:00
wangzhenxing 2e886d4524 【战斗】====清除盾效果添加破盾提示文字,清除免疫,持续伤害,控制效果添加清除提示;被动278修改;被动添加排序;控制效果结束修改 2021-03-30 16:34:17 +08:00
wangzhenxing 27e4ab6e1a [战斗]============= 获取数组的长度方法修改 2021-03-30 11:08:55 +08:00
JieLing f81e8ecaab Merge branch 'xma/dev' into master_xma_local 2021-03-29 23:34:12 +08:00
gaoxin 3ecded4430 【假战斗优化】运营活动、充值活动相关的假战斗跳过改为直接解锁,而不需要等玩家到达30级 2021-03-29 17:11:25 +08:00
wangzhenxing f497a63e73 [战斗]====================放逐添加表现 2021-03-27 20:22:14 +08:00
JieLing 80b9b48367 【合并多余修改回滚】 2021-03-27 17:35:13 +08:00
JieLing 857d0112fa Merge branch 'xma/dev' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-03-27 17:11:57 +08:00
wangzhenxing 9101433578 【战斗】==============链接符显示修改,链接符放逐修改,灵兽无目标修改 2021-03-27 12:37:50 +08:00
wangzhenxing 19d7914e78 【战斗】=======解决放逐目标有不灭不会被选中;解决只剩放逐目标攻击动画异常问题 2021-03-26 16:50:49 +08:00
wangzhenxing 19af51d38f [战斗]========= 放逐后的buff刷新修改,放逐后的被动触发屏蔽,控制类buff 叠层逻辑修改 2021-03-26 14:40:23 +08:00
gaoxin b18ad8487a 【战斗】casting层级调整,失败界面打开1秒后才能关闭 2021-03-26 12:15:48 +08:00
wangzhenxing f5a85c4d2e 【战斗】===================== 灵兽释放技能逻辑修改, rolemanager 添加获取role接口 2021-03-25 15:54:12 +08:00
wangzhenxing 8f1d56cf8f [战斗]==============灵兽每回合释放技能次数 刷新修改 2021-03-25 09:57:51 +08:00