Commit Graph

293 Commits (93b383972744d7d540699d0de8905f09fd2c00bd)

Author SHA1 Message Date
gaoxin ac88b50cae 【编队】修复打开四灵试炼编队报错 2021-09-23 16:05:18 +08:00
ZhangBiao 32585cec01 【七界试炼】增加怪物详情界面 2021-09-22 19:38:16 +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 bc659b68f8 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs
2021-09-22 10:54:15 +08:00
gaoxin e5af89fac9 Merge branch 'china/dev' into 0功能/玉虚论道
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
2021-09-22 10:37:42 +08:00
jiaoyangna 488753ab83 四灵编队修改提交
(cherry picked from commit 191603b77f)
2021-09-18 19:19:30 +08:00
jiaoyangna 4e5ef30243 在线四灵编队修改提交 2021-09-18 18:55:07 +08:00
wangzhenxing a7f0c42cae Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-18 11:52:01 +08:00
jiaoyangna ac319513dc 【ID1018514】
【四灵试炼】线上号,打开战斗编队报错
2021-09-18 11:02:32 +08:00
gaoxin 66efc9d4e3 【战斗力】新战斗力计算系统完成 2021-09-16 13:35:33 +08:00
ZhangBiao 45de3d5c99 【七界试炼】提交 2021-09-15 18:09:21 +08:00
ZhangBiao ad9bcaa2fa 【七界试炼】提交 2021-09-15 14:02:39 +08:00
ZhangBiao 599fe0dcee Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
2021-09-14 17:54:18 +08:00
wangzhenxing d056a2dd70 玉虚论道提交 2021-09-14 10:10:57 +08:00
ZhangBiao 20dc2526d6 Merge branch '0功能/玉虚论道' into 0功能/七界试炼 2021-09-13 18:09:27 +08:00
wangzhenxing b3eb686222 bug修改提交 2021-09-13 14:11:48 +08:00
ZhangBiao 94ed6ad618 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-13 13:56:43 +08:00
wangzhenxing aaa4b987eb 玉虚论道修改 2021-09-11 19:47:23 +08:00
gaoxin 7df51e8929 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
2021-09-11 16:52:33 +08:00
wangzhenxing 489f6f7e37 编对拖动英雄保存队伍修改 2021-09-10 21:34:45 +08:00
ZhangBiao 4eb8e566fe 【七界试炼】战斗结束提交 2021-09-10 18:36:39 +08:00
gaoxin 5af9e9f0ed 【编队】修复报错 2021-09-10 17:30:26 +08:00
ZhangBiao d6725f3320 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
2021-09-10 16:39:43 +08:00
gaoxin 16633b37a8 【编队优化】 2021-09-10 16:25:38 +08:00
ZhangBiao 42df2f4af5 【七界试炼】提交 2021-09-10 15:23:15 +08:00
ZhangBiao 2d003aaafd Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	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/Net/NetManager.lua
2021-09-10 10:33:44 +08:00
ZhangBiao cef2b42bcc 【七界试炼】提交 2021-09-10 10:30:50 +08:00
wangzhenxing a58b5f2d88 玉虚论道提交 2021-09-09 11:48:09 +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 c4bced89f7 【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验 2021-09-08 18:27:20 +08:00
wangzhenxing c531b3776b 玉虚论道提交 2021-09-07 18:27:23 +08:00
wangzhenxing 5f0bfe53bd 玉虚论道提交 2021-09-07 17:05:46 +08:00
jiaoyangna 13909e60aa 编队id修改 2021-09-02 17:29:44 +08:00
jiaoyangna f516731201 一键上阵修改提交 2021-09-01 17:12:25 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
ZhangBiao 74f0e3f8a2 【玉虚论道】编队界面提交 2021-08-27 13:45:09 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
ZhangBiao 6345a18ebe 【玉虚论道】我的编队界面 2021-08-26 13:42:17 +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 98649b66c1 【跨服排行】 2021-07-30 17:52:49 +08:00
zhangqiang 9a2d9c70a7 【新功能】罗浮争锋排行榜增加跨服切磋功能 2021-07-28 15:48:35 +08:00
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
zhangqiang 5162b3247c 【跨服天梯】国内提交+1 2021-07-13 11:28:36 +08:00
zhangqiang 7c7e0970a2 【跨服天梯】国内提交替换资源 。。。。 2021-07-08 10:36:33 +08:00
gaoxin 8297176603 Merge remote-tracking branch 'origin/china/quick' into china/dev
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png
#	Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-07-06 15:37:43 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
ZhangBiao 53567ea586 【Log】清除带颜色的Log 2021-07-01 16:33:40 +08:00
zhangqiang 71540fcfd2 【跨服天梯】国内提交1 2021-06-25 15:23:55 +08:00