Commit Graph

872 Commits (54aeaa2ea834392647f359f114c39604230b6c64)

Author SHA1 Message Date
wangzhenxing 1362e8b4f6 [战斗]=============第三批神魂技能提交 2021-11-17 15:01:24 +08:00
ZhangBiao d8dd88b2e2 【灵脉秘境】提交 2021-11-16 18:30:08 +08:00
ZhangBiao 6012b533ca 【灵脉秘境】提交 2021-11-16 17:34:37 +08:00
gaoxin ce5042eb86 【克制属性】添加 2021-11-16 16:59:59 +08:00
gaoxin b6ea250096 【新手战斗】选择女角色后,战斗中立绘替换为女角色 2021-11-15 18:34:25 +08:00
gaoxin 3a70720f9c 【新手战斗】第一场战斗关闭跳过 2021-11-15 17:26:04 +08:00
liujiaqi 1498cd7661 【新手战斗】报错修复 2021-11-19 17:20:28 +08:00
gaoxin 79d22b0545 【新手战斗】回合开始触发改为回合结束触发 2021-11-15 17:09:52 +08:00
gaoxin 9c50acee09 【引导战斗】添加第N回合开始时触发剧情 2021-11-15 16:46:41 +08:00
gaoxin f7a1ddbc94 【假战斗】背景走表配置 2021-11-15 16:39:38 +08:00
wangzhenxing 7790f90d8f 【战斗】=======被动处理伤害修改 2021-11-15 10:34:13 +08:00
wangzhenxing 7dfa28321c [战斗]======被动376 377修改 2021-11-12 17:38:28 +08:00
gaoxin 83583747ad Merge branch '0功能/和谐资源后台控制' into china/dev 2021-11-12 16:39:53 +08:00
wangzhenxing 41dc490d28 【战斗】=============== 被动处理伤害方法只处理减伤 2021-11-12 15:54:54 +08:00
wangzhenxing 4756c0b19e [战斗]========363被动替换逻辑修改 2021-11-12 15:31:01 +08:00
gaoxin 451d8f4460 【战斗】伤害数字延时显示 2021-11-12 11:59:40 +08:00
wangzhenxing f71bbbdf95 [战斗]===========第二期神魂被动提交 2021-11-11 14:01:32 +08:00
gaoxin b661b04ad1 【新假战斗】修复正常战斗报错,修复加战斗中主角性别错误 2021-11-10 13:22:32 +08:00
gaoxin 880c77888a 【新假战斗】加入主角技能 2021-11-10 11:03:18 +08:00
gaoxin c9e2ddcaf8 【新假战斗】 2021-11-10 09:48:42 +08:00
gaoxin 3131ffca2f 【资源和谐】后台控制完成 2021-11-09 10:49:37 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
wangzhenxing d30fc43d9f 【战斗】============被动285修改 2021-11-08 15:28:04 +08:00
wangzhenxing 8bc936aff8 【神魂】=====伤害统计界面神魂显示修改 2021-11-05 18:24:05 +08:00
gaoxin d4582cf244 【神魂】修复战斗中神魂特效不显示的问题 2021-11-05 18:13:32 +08:00
jiaoyangna 420356da83 添加特效 2021-11-05 14:33:09 +08:00
wangzhenxing 6ace7b50ab [战斗]======被动154 200 360 修改 2021-11-05 13:17:17 +08:00
jiaoyangna 5ac1f04718 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:18:28 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
wangzhenxing 51dfdede03 [战斗]===========被动371 368修改 2021-11-05 09:50:28 +08:00
wangzhenxing 661ea27421 [战斗]======被动357修改 御甲buff修改 2021-11-04 16:57:06 +08:00
wangzhenxing b6ec2b0f89 【战斗】======被动360修改 2021-11-04 15:40:14 +08:00
wangzhenxing 113e1ebefa 【战斗】=====被动356 修改 2021-11-04 14:13:28 +08:00
wangzhenxing 41044877f1 [战斗]=============被动357修改 2021-11-04 13:43:05 +08:00
wangzhenxing 878b12f574 【战斗】===============被动364-371 提交 307 360修改 2021-11-04 10:27:02 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
wangzhenxing 6092ce28c0 【战斗】=========处理战斗伤害记录不显示敌方主角 2021-11-02 20:19:36 +08:00
wangzhenxing 46fe5a1b8d 【战斗】======战斗结果显示主角伤害治疗修改 2021-11-02 18:00:31 +08:00
wangzhenxing 7331cdb7d0 【战斗】======灵兽技能检测方法初始化时清空, 战斗治疗数据记录修改 2021-11-02 13:33:35 +08:00
wangzhenxing a55388942b 【战斗】=========追加的技能显示皮肤的特效 2021-11-01 19:22:48 +08:00
DESKTOP-98AVA47\Administrator 689522120c [战斗]============山河社稷图 星级检测条件修改 之前放逐的不会判断进人数 2021-11-02 06:42:19 +08:00
wangzhenxing 3815dc0ff3 [战斗]=======灵兽技能触发机制修改 2021-10-29 15:50:17 +08:00
wangzhenxing d004e1d459 【神魂】======战斗中 和伤害记录界面加神魂显示 2021-10-29 15:14:01 +08:00
wangzhenxing e738e8eda8 【战斗】===========被动180 修改提交 2021-10-28 14:41:01 +08:00
wangzhenxing 74dea991bc [战斗]======被动355-363 提交 2021-10-28 09:48:01 +08:00
gaoxin 266d3088e7 【战斗】修复假战斗报错 2021-10-26 21:43:00 +08:00
wangzhenxing a38fe30800 [主角技能]=====注重主角立绘等级显示修改 2021-10-26 18:03:02 +08:00
gaoxin e7da10a595 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 14:45:34 +08:00
gaoxin a692f8d9d4 【本场最佳】主角名颜色根据修行等级改变 2021-10-26 14:45:28 +08:00
wangzhenxing 4c292035cf [主角技能]======心魔试炼快速战斗不显示主角伤害记录修改 2021-10-26 14:00:23 +08:00
wangzhenxing 7b406e1c4b 【战斗】===========主角技能使用 队伍战斗力 接口修改 2021-10-25 16:37:41 +08:00
wangzhenxing 237767eb29 【战斗】=============灵兽技能 8 回合cd判断修改 2021-10-25 15:54:38 +08:00
wangzhenxing 09755c8d12 [战斗]==============测试战斗添加主角技能检测,攻击就是队伍战斗力 2021-10-25 13:48:48 +08:00
wangzhenxing 7ae770a3b0 [战斗]=============伤害力公式修改 防御 乘2 2021-10-25 11:48:54 +08:00
wangzhenxing 5e541238de [战斗]=============128 129 130 131 修改 添加最大限制 2021-10-22 17:34:15 +08:00
gaoxin 24ea182587 【最佳】加入主角伤害展示 2021-11-10 02:52:51 +08:00
wangzhenxing fc3edefd82 【战斗】=====hot buff修改提交 2021-10-22 14:11:25 +08:00
wangzhenxing 8035e3f6f3 [战斗]==============战斗消息位置修改 2021-10-22 14:04:15 +08:00
wangzhenxing e0b7df4206 [战斗]==========被动199 历战之躯 被动修改 2 2021-10-22 13:57:51 +08:00
wangzhenxing 2a6f3389b3 [战斗]=============被动199 历战之躯 修改 2021-10-22 13:35:44 +08:00
wangzhenxing 7261a428fb 主角技能伤害提交 2021-10-21 17:47:49 +08:00
wangzhenxing 5575ba2245 [战斗]=====灵兽技能修改提交 2021-10-21 16:17:10 +08:00
wangzhenxing 3d9bf0041f [战斗]============灵兽技能伤害不检测是否命中 2021-10-21 13:25:41 +08:00
wangzhenxing 18da581061 [战斗]=====技能添加空判断 2021-10-21 10:41:57 +08:00
wangzhenxing 7b7879ce89 [战斗]=========效果130修改 2021-10-20 22:00:01 +08:00
wangzhenxing 24f0812b9f 主角技能提交 2021-10-20 21:33:37 +08:00
wangzhenxing 54b07410bf Merge branch 'china/dev' into 0功能/玉虚论道 2021-10-19 10:12:38 +08:00
wangzhenxing b5f27a64af 主角技能提交 2021-10-19 10:00:34 +08:00
wangzhenxing 23ed8a7a2b 【战斗】==========被动344添加空判断 2021-10-16 18:12:56 +08:00
wangzhenxing 267598d53b Revert "【战斗】=======被动199"
This reverts commit c8603f010f.
2021-10-16 18:07:30 +08:00
wangzhenxing c8603f010f 【战斗】=======被动199 2021-10-16 16:47:57 +08:00
wangzhenxing fbb1c387c7 【战斗】=======伤害公式 修改 去点 防御0.5的容错 2021-10-14 17:12:01 +08:00
wangzhenxing f0fcd144f2 [战斗]===========被动添加 354 355 2021-10-14 13:54:07 +08:00
wangzhenxing d2c2b39b8b [战斗]==========被动312修改 2021-10-11 17:46:01 +08:00
wangzhenxing 453216c6c7 【战斗】==========被动344修改 2021-10-09 18:23:45 +08:00
wangzhenxing 79addd132d [战斗]=========被动250 修改 2021-10-09 18:10:11 +08:00
wangzhenxing 4bd1047ccc [战斗]=====被动116 258 281 312 344修改 2021-10-09 17:13:24 +08:00
wangzhenxing 31e8594a70 [战斗]=========御甲添加 图片字提示表现 2021-09-30 09:53:31 +08:00
wangzhenxing 1a808dfd54 [战斗]============被动137修改 添加查找没有触发不灭的技能目标 2021-09-27 17:33:51 +08:00
wangzhenxing 70ebab2fe1 【功能】====装备合成添加特效 2021-09-27 16:25:20 +08:00
wangzhenxing 433ae25590 [战斗]======被动351 353 修改 2021-09-27 13:47:27 +08:00
gaoxin ace42823db 【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题 2021-09-26 20:48:32 +08:00
gaoxin 2bce8547c7 【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害 2021-09-26 20:31:51 +08:00
wangzhenxing 221939e1ec [战斗]==========御甲条显示修改 2021-09-26 14:56:07 +08:00
wangzhenxing d83cf97ae2 【战斗】==========被动93 307 309 351修改 2021-09-24 17:40:08 +08:00
wangzhenxing 34f52e18e7 [战斗]=====被动352 描述修改 2021-09-24 15:20:59 +08:00
wangzhenxing 8ffd86ee19 Merge branch 'china/dev-c-battle' into china/dev
Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-09-24 15:13:46 +08:00
wangzhenxing 19f7984f01 [战斗]=============新增352被动 2021-09-24 14:59:54 +08:00
wangzhenxing 9abf1ef390 Merge branch 'china/dev-c-battle' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c-battle
Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-09-24 14:56:13 +08:00
wangzhenxing 48cc9357c1 [战斗]==========被动194修改 新增被动251 额外行动修改 2021-09-24 14:46:02 +08:00
wangzhenxing cbb22260f3 Merge branch 'china/dev-c-battle' into china/dev 2021-09-23 11:02:19 +08:00
wangzhenxing fbaca4e989 [战斗]====添加间接治疗得方法 2021-09-23 10:51:21 +08:00
gaoxin 34f3f42a04 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
2021-09-22 15:36:10 +08:00
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
wangzhenxing d5ce7b7f84 【战斗】=======被动37修改 2021-09-17 17:07:57 +08:00
wangzhenxing 01e446fed3 [战斗]======免疫buff添加类型 5 免疫控制不免疫禁疗 2021-09-17 16:55:49 +08:00
gaoxin feae377b4f Merge branch 'china/dev' into 0功能/角色战斗力计算2 2021-09-17 15:25:56 +08:00
wangzhenxing df1409717d 【战斗】==============技能是否可以释放处 添加目标数量判断,如果没有目标则不能释放 2021-09-17 15:20:44 +08:00
ZhangBiao 2925de34e8 【七界试炼】结算界面提交 2021-09-17 14:38:05 +08:00
wangzhenxing 52221aca04 【战斗】==========被动196 修改 2021-09-17 14:26:30 +08:00
wangzhenxing 4511eec383 【战斗】==========被动196 修改 2021-09-17 11:55:18 +08:00
gaoxin 38fcf555dd 【山河社稷图】修复战斗不一致 2021-09-16 22:43:38 +08:00
wangzhenxing e584db1eaa [战斗]===========被动196 200 188修改 2021-09-16 20:31:12 +08:00
ZhangBiao 60c954bf38 【七界试炼】提交 2021-09-16 19:36:16 +08:00
wangzhenxing 3b42d8034d [战斗]==============技能实例里 技能是否能释放添加判断 如果没有攻击目标就返回 false 2021-09-16 17:27:16 +08:00
gaoxin 2494b16f89 Merge branch 'china/dev' into 0功能/角色战斗力计算2 2021-09-16 13:37:16 +08:00
gaoxin 66efc9d4e3 【战斗力】新战斗力计算系统完成 2021-09-16 13:35:33 +08:00
wangzhenxing 4ee0741896 [战斗]==============被动338修改 护甲逻辑修改 2021-09-15 11:23:04 +08:00
wangzhenxing 08ecd82227 【战斗】==============被动346 347 348 349 350 提交 2021-09-14 19:58:01 +08:00
wangzhenxing dbf05190bc Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua
2021-09-14 10:32:25 +08:00
wangzhenxing 982e0c5268 【战斗】=======被动56修改 2021-09-13 20:17:37 +08:00
wangzhenxing b468cb6164 [战斗]============被动56修改 boss免疫额外生命百分比伤害 2021-09-13 19:43:13 +08:00
wangzhenxing 79778b6eec 【战斗】===========被动261 修改 2021-09-11 16:04:06 +08:00
gaoxin 3e3d0d9416 Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-09-09 11:22:47 +08:00
gaoxin 2a23609ed6 【战斗】添加缺失的方法 2021-09-07 19:43:08 +08:00
gaoxin 0bd0137a2b 【战斗】v1.0.57
1、尝试修复孙悟空大招不会增加伤害的问题
 2、添加用于debug的log
2021-09-07 15:14:10 +08:00
jiaoyangna 4d5876eb28 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
2021-09-02 19:33:48 +08:00
wangzhenxing 3e36a537b3 [战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改 2021-09-01 18:40:32 +08:00
gaoxin 8a0b1c80a2 【战斗】被动添加时Log 2021-08-31 14:48:44 +08:00
gaoxin 4e8e552ca8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:29:46 +08:00
wangzhenxing 7eeebb014e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:26:02 +08:00
wangzhenxing 8c6c57d916 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 14:25:43 +08:00
gaoxin 93413b3b07 【战斗】添加一些战斗日志 2021-08-31 14:25:29 +08:00
gaoxin c67c9fb93b 【战斗】修复战斗报错 2021-08-31 13:44:13 +08:00
jiaoyangna 13f74e0185 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-31 11:39:16 +08:00
wangzhenxing 6ef1d6c643 【战斗】===========被动115 DOT类Buff 清除逻辑修改 2021-08-27 18:02:50 +08:00
wangzhenxing 58f34e049b 【战斗】=============被动91,160 修改提交 2021-08-27 15:27:53 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
wangzhenxing 690db47d68 【战斗】=========复活,新灼烧特效预设提交 2021-08-25 14:37:10 +08:00
wangzhenxing 9a02e18582 【战斗】==============被动 141 310 283 330 336 修改提交 2021-08-20 16:05:33 +08:00
wangzhenxing 11a39abcd4 [战斗]==========伤害修改提交 2021-08-12 15:42:31 +08:00
wangzhenxing 08d02a0b6d [战斗]==========后续紫府神印提交 2021-08-12 15:11:38 +08:00
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
wangzhenxing c3ca8f5286 Merge branch 'china/dev' into china/dev-c-battle 2021-08-03 11:49:12 +08:00
gaoxin ac62390992 Revert "Revert "[战斗]========服务器发送随机种子修改""
This reverts commit 0b827be035.
2021-08-02 19:22:05 +08:00
gaoxin 0b827be035 Revert "[战斗]========服务器发送随机种子修改"
This reverts commit 331621bfd0.
2021-08-02 18:26:33 +08:00
wangzhenxing 331621bfd0 [战斗]========服务器发送随机种子修改 2021-08-02 16:46:54 +08:00
wangzhenxing fdfa2dd76b [战斗]============追加额外技能是否触发特性修改,哪吒大招后摇时间延长 2021-07-30 16:03:22 +08:00
wangzhenxing 2cafeecb80 [战斗]==============死亡技能不受眩晕,沉默影响 2021-07-29 15:44:23 +08:00
wangzhenxing f275a590a1 Merge branch 'china/dev' into china/dev-c-battle 2021-07-27 15:07:43 +08:00
zhangqiang 1cf142c82b 【跨服天梯】国内提交+1 2021-07-22 19:01:46 +08:00
wangzhenxing 59f131e824 [战斗]============被动338,339提交 2021-07-21 16:33:23 +08:00
wangzhenxing 59b36cbf94 [战斗]==========被动292 修改 追加得技能一次行动只追加一次,且不触发任何特性 2021-07-16 18:36:52 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
wangzhenxing 4d428fd383 [战斗]==========被动292 ,319 修改 2021-07-15 18:20:38 +08:00
JLIOSM1 63dc0dc0c2 合并zf_test到iOS 2021-07-13 18:55:21 +08:00
JLIOSM1 5b311e2ac8 【http】请求加密 2021-07-13 18:24:33 +08:00
wangzhenxing 33b37451e1 【战斗】=============被动 108 200 283 322 修改 新增被动 337 2021-07-09 11:54:02 +08:00
wangzhenxing f247221fcc 【战斗】=========被动104 267 319 修改; 战斗显示修改 击杀同时给敌人上buff 不显示buff图标提示(除不灭。死亡技能) 2021-07-07 20:29:37 +08:00
wangzhenxing 802f41cadd Merge branch 'china/dev-c-battle' into china/dev 2021-07-03 14:18:37 +08:00
wangzhenxing 94dde31cf9 [战斗]====中毒伤害图片字提交 2021-07-02 19:12:09 +08:00
wangzhenxing 338ab55daa 【战斗】=========新增336被动 2021-07-02 14:49:28 +08:00
wangzhenxing 6e0c8e55c8 [战斗]==========被动335修改 困难副本 星级条件13修改 2021-07-02 11:20:52 +08:00
wangzhenxing d00d69ff68 [战斗]============第二期紫府神印提交 2021-07-02 09:56:06 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
wangzhenxing 1be7c40f2f [战斗]==========困难副本 13类型 检测修改 2021-07-01 11:51:30 +08:00
wangzhenxing 7f8247acaf [战斗]==========困难副本 13类型 检测修改 2021-07-01 11:47:40 +08:00
wangzhenxing f50ffa0746 Merge branch 'china/dev' into china/dev-c-battle 2021-06-30 19:53:11 +08:00
wangzhenxing 2578107be4 【战斗】============战斗图片字显示修改 2021-06-30 18:06:56 +08:00
wangzhenxing b99c52d22c 【bug】========【ID1016790】
灼烧 中毒等buff 在携带者被杀死的情况不提示清除
2021-06-30 18:03:13 +08:00
wangzhenxing aeed1703bd 【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交 2021-06-30 10:40:52 +08:00
gaoxin e46c1eb833 【GM】演算后端战斗接口添加GM地址配置 2021-06-28 11:50:10 +08:00
ZhangBiao 08ded6e512 【皮肤】战斗结算,mvp名字,战斗统计头像 2021-06-24 18:01:05 +08:00
wangzhenxing 5e8bab74af [战斗]==========被动26, 327 107, 331 修改提交 2021-06-23 16:28:57 +08:00
wangzhenxing d943d3044b Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-06-21 15:29:16 +08:00
wangzhenxing 5184ced8c8 [战斗]==============免疫buff清除提示修改 2021-06-19 16:41:00 +08:00
gaoxin ac7501a1d5 【战斗】修复群体性的免疫效果不会正常消失的问题 2021-06-17 16:01:48 +08:00
wangzhenxing 27b3d6e5c7 【战斗】=============被动56,被动283,被动324修改 不灭修改 2021-06-17 14:12:34 +08:00
wangzhenxing b1425236af [战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交 2021-06-16 10:27:56 +08:00
wangzhenxing 588ca169c9 [战斗]======被动200去掉注释 2021-06-11 11:51:52 +08:00
gaoxin 4ee928c2d4 Merge remote-tracking branch 'origin/china/zf_test' into china/dev-c 2021-06-10 22:56:18 +08:00
jiaoyangna b76f517cbb [战斗]===============被动200修改 同阵营这个被动只会触发一次 2021-06-10 22:08:51 +08:00
wangzhenxing 4165e6acd5 【战斗】=======注释之前被动200修改 2021-06-10 22:02:35 +08:00
wangzhenxing 77121e01e3 [战斗]=========被动200 同一个阵营如果有多个200被动 只会生效一个 2021-06-10 21:57:00 +08:00
gaoxin c895ce0faf 【战斗】优化指定目标特效显示错误的问题 2021-06-09 18:11:07 +08:00
gaoxin 86985803ba 【战斗】修复受击特效显示位置错误 2021-06-09 17:09:39 +08:00
gaoxin 844e265453 【特效】修复部分技能特效显示异常的问题 2021-06-09 16:05:19 +08:00
ZhangBiao f0cd4b3bc0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-04 16:10:28 +08:00
ZhangBiao 4b708011bc 【玩家信息】红点问题修复 和log清楚 2021-06-04 16:10:17 +08:00
gaoxin b30359d2f5 【战斗】心魔试炼背景图修改 2021-06-04 15:17:43 +08:00
gaoxin 746e92f23d 【战斗】日常副本,无尽副本,山河社稷图战斗背景修改 2021-06-04 15:01:48 +08:00
gaoxin c067b888d3 【登录视频】如果登录视频加载失败不再播放,战斗还原boss关卡不能跳过的功能 2021-06-04 14:53:37 +08:00
gaoxin bc65257ac7 【战斗】跳过提示修改为25级 2021-06-04 11:18:46 +08:00
gaoxin 327efb10d0 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:26 +08:00
gaoxin 6268827039 【战斗】首领关卡跳过功能打开 2021-06-03 14:19:45 +08:00
wangzhenxing ba04ea8e71 【心愿抽卡】====修改概率显示,必得剩余次数修改 2021-06-02 11:29:26 +08:00
wangzhenxing 7387023dfe [战斗]======通关星级条件 检测逻辑 4 修改 2021-05-31 17:33:29 +08:00
gaoxin 1ea3890111 【战斗】报错优化 2021-05-29 15:21:41 +08:00
gaoxin 593a8cb398 【山河社稷图】猪八戒普攻后半身像显示不全 2021-05-28 13:31:06 +08:00
wangzhenxing 675ef2efd7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2021-05-28 10:47:07 +08:00
wangzhenxing 21574bebf1 【限时祈愿】==祈愿活动提交 2021-05-28 10:36:55 +08:00
gaoxin 33efb7bc2a 【修行】亢龙有悔,东陵圣母大招没有眩晕敌方,没回怒
【修行】亢龙有悔神印,达摩连续追击,连续没眩晕,只第一次回了怒
2021-05-27 23:33:03 +08:00
gaoxin a1df6cbcf5 【战斗】尝试修复竞技场战斗报错 2021-05-27 22:11:06 +08:00
ZhangBiao 1e2a932096 【修行预览、神将信息】 2021-05-25 11:06:20 +08:00
jiaoyangna 4452bb1d9a 音效提交 2021-05-24 20:22:38 +08:00
gaoxin 23001be1b4 【战斗】跳过优化 2021-05-24 19:20:22 +08:00
jiaoyangna 33834cc9b2 Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Atlas/FourElement.meta
#	Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-05-24 16:39:34 +08:00
gaoxin 24e02b07c6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-21 15:31:48 +08:00