Commit Graph

95 Commits (65d783dae1b6fff8758009ac3412cd43f953c8f1)

Author SHA1 Message Date
wangzhenxing 6a44a24e2b 野球拳法跳转修改 2023-02-10 17:03:29 +08:00
wangzhenxing aa4353177b [bt=======妖晶跳转修改提交] 2022-11-30 14:34:17 +08:00
wangzhenxing 032ef3d34d [bt]======充值修改 2022-11-29 17:42:48 +08:00
wangzhenxing bfd7967d52 抽卡红点修改 2022-11-23 14:33:39 +08:00
yuanshuai 985391bba4 【BT】【神尊特权】缺少仙晶获取途径bug修改 2022-11-10 14:00:59 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
wangzhenxing 60b499f13c [洞府]======资源条显示修改 2022-09-05 11:14:13 +08:00
wangzhenxing 62a0903bc1 [资源条]======屏蔽寻宝迷踪加号 2022-07-13 19:27:38 +08:00
wangzhenxing e0263ea164 添加神印笔跳转 2022-04-25 13:43:46 +08:00
wangzhenxing 3678f78c75 神印币添加跳转 2022-04-24 21:26:32 +08:00
ZhangBiao 6283677b8f 【诸多修改】提交 2022-01-18 10:53:25 +08:00
ZhangBiao 11b9a285ba 【家园】upview提交 2022-01-06 16:41:17 +08:00
ZhangBiao 6b1c28a920 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2022-01-06 16:40:24 +08:00
ZhangBiao 499e1d2d49 【家园】界面微调 2022-01-06 10:56:59 +08:00
jiaoyangna af30beccd3 资源条跳转错误修改提交 2021-12-30 18:12:56 +08:00
jiaoyangna 978689d9a7 探索提交 2021-12-28 17:52:28 +08:00
ZhangBiao fe99e89eb9 【连购礼包】顶呱深处跳转修改 2021-12-06 19:11:45 +08:00
ZhangBiao 9db47caa8e 【连购礼包】跳转修改 2021-12-06 18:59:57 +08:00
jiaoyangna 0ca366cdf4 添加加号提交 2021-12-06 11:11:16 +08:00
jiaoyangna 0c6ff17ddd 修改提交 2021-11-27 14:30:51 +08:00
ZhangBiao aa52131d3f 【灵脉秘境】文字遮挡、跳转 2021-11-22 13:27:54 +08:00
wangzhenxing a3e1782007 【功能】==========白金装备合成提交 2021-09-26 17:30:35 +08:00
jiaoyangna 2e08cf7672 玲珑宝镜消耗道具添加加号 2021-09-23 15:50:32 +08:00
ZhangBiao cea14746f8 【七界试炼】提交 2021-09-22 13:33:48 +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 e5af89fac9 Merge branch 'china/dev' into 0功能/玉虚论道
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
2021-09-22 10:37:42 +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 a15bd40b96 【寻宝迷踪】跳转惊喜礼盒 2021-09-18 11:33:46 +08:00
ZhangBiao d49d73dcb5 【寻宝迷踪】跳转提交 2021-09-15 19:14:18 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
ZhangBiao b609616b6b 【七界试炼】提交 2021-09-13 18:06:39 +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
ZhangBiao 41282c144c 【七界试炼】七界币增加加号 2021-09-11 15:47:19 +08:00
wangzhenxing e2f7284507 qqqq 2021-09-10 15:50:24 +08:00
jiaoyangna 96f2530ae8 加号修改 2021-09-02 16:20:33 +08:00
jiaoyangna 37c1c77737 添加道具 太初之气 加号 2021-09-02 16:17:26 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
ZhangBiao 6c2e75b384 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-20 14:40:19 +08:00
jiaoyangna bb8ca3c5ca 四元阵跳转修改 2021-08-19 16:44:13 +08:00
ZhangBiao d017873b79 【寻宝迷踪】提交 2021-08-10 15:27:32 +08:00
zhangqiang 71f7e8a469 Merge branch 'china/dev' into china/jumpserver
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-27 11:26:30 +08:00
JLIOSM1 c2dfe0ee92 【IOS提审】链接提审服时,部分按钮跳转到妖晶充值 2021-07-21 11:33:09 +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
ZhangBiao 4fdbc4a559 【降妖夺宝】抽卡跳转修改 2021-06-21 11:45:03 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
gaoxin 3204bd5945 【upview】优化被关闭后依然可以通过事件触发报错的问题 2021-06-05 00:25:54 +08:00
ZhangBiao 4b708011bc 【玩家信息】红点问题修复 和log清楚 2021-06-04 16:10:17 +08:00
gaoxin d89511a3d9 【跳转】资源条添加碎繁星辰跳转 2021-05-21 11:02:24 +08:00