Commit Graph

254 Commits (cc68282fb8bb69e6e8da29bddfe2e21ee112e273)

Author SHA1 Message Date
ZhangBiao 8f9743d127 【七界试炼】激活遗物提示,奖励遮盖 2021-09-26 10:01:37 +08:00
ZhangBiao 1a866b1068 【七界试炼】提交 2021-09-24 19:23:30 +08:00
ZhangBiao b0e24676b3 【七界试炼】增加秘宝入口开启处理 2021-09-24 14:57:04 +08:00
ZhangBiao d0c38ec9d7 【七界试炼】提交 2021-09-23 19:47:17 +08:00
ZhangBiao 0422b5c738 【七界试炼】提交 2021-09-23 16:08:02 +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 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
ZhangBiao 8307fbe7e1 【七界试炼】完成!!! 2021-09-17 19:57:45 +08:00
ZhangBiao 949d159010 【七界试炼】提交 2021-09-17 19:29:58 +08:00
ZhangBiao 488ad1caad 【七界试炼】七界秘宝提交 2021-09-17 17:42:18 +08:00
ZhangBiao c68496654f 【七界试炼】遗物 2021-09-13 13:54:58 +08:00
ZhangBiao 8c9f31f028 【七界试炼】遗物 2021-09-13 11:42:14 +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 cef2b42bcc 【七界试炼】提交 2021-09-10 10:30:50 +08:00
ZhangBiao 1fefbb43e6 【七界试炼】提交 2021-09-09 11:10:43 +08:00
jiaoyangna 3ef0ad39b6 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 20:06:09 +08:00
jiaoyangna 615aaa0d88 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 19:59:37 +08:00
jiaoyangna f49deb2471 回放修改提交 2021-09-01 18:13:58 +08:00
jiaoyangna ae71f6941d 四灵修改提交 2021-09-01 18:10:51 +08:00
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +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
DESKTOP-98AVA47\Administrator 6f8cb042bb 报错修改提交 2021-07-23 11:17:50 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +08:00
wangzhenxing 65a6edeba5 [乾坤宝盒]======改成只能选择3个 2021-07-16 14:20:25 +08:00
wangzhenxing fe8714f7fa [乾坤宝盒]========优化提交 2021-07-15 16:43:35 +08:00
wangzhenxing fcaa098564 [乾坤宝盒]===========功能修改 2021-07-15 14:57:34 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
jiaoyangna 9fa4e26f7e 仙缘汇聚箱修改提交 2021-07-05 09:55:02 +08:00
jiaoyangna 7c1d58b3eb 青龙秘宝修改 提交 2021-06-09 18:48:24 +08:00
jiaoyangna fdc4d2f203 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-09 18:24:27 +08:00
jiaoyangna 970a96b4f4 【ID1016342】
【解锁秘宝优化】激活可直接领取奖励预览中,没有显示专属奖励
2021-06-09 17:45:13 +08:00
jiaoyangna a54e1088e6 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-09 11:25:05 +08:00
jiaoyangna 2ed4480d92 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-08 17:57:59 +08:00
jiaoyangna 0268a71c9b 无尽秘宝描述修改提交 2021-05-31 17:07:49 +08:00
wangzhenxing 10f97f9b8b [许愿神将]===活动修改 2021-05-31 11:31:15 +08:00
gaoxin 92a04cc440 【抽卡】修复第一次抽卡报错的问题 2021-05-31 11:06:20 +08:00
zhangqiang 2c27d19046 【关卡属性提升】修改提交 2021-05-29 22:49:43 +08:00
jiaoyangna acfc98c16f 延续时间修改 2021-05-29 22:47:20 +08:00
jiaoyangna 9eee295a1f 价格修改提交 2021-05-29 20:17:50 +08:00
jiaoyangna b071e12e29 秘宝描述修改 2021-05-29 20:04:48 +08:00
wangzhenxing a7de414589 [限时抽卡活动] 抽卡优化,奖励展示修改 2021-05-29 18:27:03 +08:00
wangzhenxing 62f5514f80 [限时抽卡] 【公会福利红包】bug修改 2021-05-29 16:26:05 +08:00
wangzhenxing b49fcce742 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 15:37:09 +08:00
wangzhenxing 574d95b607 [限时祈愿活动]======修改bug提交 2021-05-29 15:35:52 +08:00
zhangqiang 4b289f571b 【关卡属性提升界面修改】 2021-05-29 15:06:16 +08:00
wangzhenxing 2526371970 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:09:29 +08:00
wangzhenxing 510b2460ea [限时祈愿] 活动奖励界面提交 2021-05-28 15:09:18 +08:00