gaoxin
|
a692f8d9d4
|
【本场最佳】主角名颜色根据修行等级改变
|
2021-10-26 14:45:28 +08:00 |
gaoxin
|
24ea182587
|
【最佳】加入主角伤害展示
|
2021-11-10 02:52:51 +08:00 |
wangzhenxing
|
7261a428fb
|
主角技能伤害提交
|
2021-10-21 17:47:49 +08:00 |
wangzhenxing
|
18da581061
|
[战斗]=====技能添加空判断
|
2021-10-21 10:41:57 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
wangzhenxing
|
31e8594a70
|
[战斗]=========御甲添加 图片字提示表现
|
2021-09-30 09:53:31 +08:00 |
wangzhenxing
|
cbb22260f3
|
Merge branch 'china/dev-c-battle' into china/dev
|
2021-09-23 11:02:19 +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 |
gaoxin
|
feae377b4f
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-17 15:25:56 +08:00 |
ZhangBiao
|
2925de34e8
|
【七界试炼】结算界面提交
|
2021-09-17 14:38:05 +08:00 |
gaoxin
|
38fcf555dd
|
【山河社稷图】修复战斗不一致
|
2021-09-16 22:43:38 +08:00 |
ZhangBiao
|
60c954bf38
|
【七界试炼】提交
|
2021-09-16 19:36: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
|
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 |
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 |
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
|
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 |
zhangqiang
|
1cf142c82b
|
【跨服天梯】国内提交+1
|
2021-07-22 19:01:46 +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 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
wangzhenxing
|
2578107be4
|
【战斗】============战斗图片字显示修改
|
2021-06-30 18:06:56 +08:00 |
wangzhenxing
|
aeed1703bd
|
【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交
|
2021-06-30 10:40:52 +08:00 |
ZhangBiao
|
08ded6e512
|
【皮肤】战斗结算,mvp名字,战斗统计头像
|
2021-06-24 18:01:05 +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
|
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 |
gaoxin
|
1ea3890111
|
【战斗】报错优化
|
2021-05-29 15:21:41 +08:00 |
gaoxin
|
593a8cb398
|
【山河社稷图】猪八戒普攻后半身像显示不全
|
2021-05-28 13:31:06 +08:00 |
gaoxin
|
a1df6cbcf5
|
【战斗】尝试修复竞技场战斗报错
|
2021-05-27 22:11:06 +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
|
f6067f4402
|
【战斗】跳过优化
|
2021-05-21 15:31:40 +08:00 |
jiaoyangna
|
d9c94e250f
|
删除log
|
2021-05-27 20:24:10 +08:00 |
jiaoyangna
|
1e247043ac
|
Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-27 19:42:22 +08:00 |
jiaoyangna
|
b1cf308eeb
|
无尽修改提交
|
2021-05-27 18:08:26 +08:00 |
gaoxin
|
eaa3d5de88
|
【日常副本】跳过还原
|
2021-05-27 16:16:21 +08:00 |