Commit Graph

168 Commits (1e3b3c9f27b99d2c8f90defb67bf4b260ceca3ff)

Author SHA1 Message Date
ZhangBiao 1e3b3c9f27 【御剑行】修改提交 2021-10-20 18:31:59 +08:00
ZhangBiao 3d0e6a4be4 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-10-18 11:35:58 +08:00
ZhangBiao a162e6aa64 【御剑行】 2021-10-15 14:50:59 +08:00
ZhangBiao decf1b869c 【御剑行】提交 2021-10-15 14:47:14 +08:00
jiaoyangna e026881024 ID1010484】
易经宝库可选奖励优化
2021-10-15 14:35:57 +08:00
ZhangBiao e43abf17b2 【御剑行】提交 2021-10-15 14:14:04 +08:00
ZhangBiao cbef4e021b 【御剑行】提交 2021-10-15 14:02:33 +08:00
ZhangBiao 132dc11c6b 【御剑行】提交 2021-10-15 13:33:58 +08:00
ZhangBiao 46d38b01ec 【御剑行】提交 2021-10-14 18:02:30 +08:00
ZhangBiao 4b6079d4e8 【御剑行】提价 2021-10-14 17:10:40 +08:00
ZhangBiao 4eb6e1d9ae 【御剑行】提交 2021-10-14 11:25:44 +08:00
ZhangBiao 2101e974ad 【御剑行】增加投注滑动条 2021-10-14 09:53:51 +08:00
ZhangBiao bb9533781d 【御剑行】提交 2021-10-13 19:15:39 +08:00
ZhangBiao 018c09d69c 【御剑行】竞猜,差一个三级弹窗 2021-10-13 17:30:26 +08:00
ZhangBiao 6870073129 【御剑行】排行完成 2021-10-13 15:39:47 +08:00
ZhangBiao 21bdecb465 【御剑行】提交 2021-10-08 20:49:25 +08:00
ZhangBiao 59e51aefef 【七界试炼】提交 2021-09-26 10:08:15 +08:00
ZhangBiao d0c38ec9d7 【七界试炼】提交 2021-09-23 19:47:17 +08:00
ZhangBiao 5af10faa57 【七界试炼】提交 2021-09-23 19:23:27 +08:00
ZhangBiao 0422b5c738 【七界试炼】提交 2021-09-23 16:08:02 +08:00
ZhangBiao 9bac3f850e 【七界试炼】提交 2021-09-23 14:13:34 +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 2ca77d75ef 【易经宝库】修服选中大奖后次数显示异常 2021-09-18 18:40:21 +08:00
jiaoyangna 3f24f4cd86 四灵试炼 修改提交 2021-09-18 17:58:28 +08:00
jiaoyangna 02f1888f3f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-18 17:07:42 +08:00
jiaoyangna 13e0865cc2 四灵助战报错修改 2021-09-18 17:07:01 +08:00
gaoxin e3f4808936 【易经宝库】选择奖励界面显示错误 2021-09-18 16:32:52 +08:00
gaoxin a3ff527bc9 【易经宝库】选择奖励界面,选中奖励后的显示效果优化 2021-09-18 16:14:03 +08:00
gaoxin 7e954b997a 【易经宝库】修复查看剩余奖励报错 2021-09-18 15:15:22 +08:00
gaoxin 39b7267239 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-18 14:19:31 +08:00
gaoxin a80d16fbda 【易经宝库】修改选择奖励界面的排序规则 2021-09-18 14:19:26 +08:00
jiaoyangna 2bfe122214 易经宝库选择报错修改提交
(cherry picked from commit 8ae7a3174f)
(cherry picked from commit 20ccbed3c9)
2021-09-18 13:43:36 +08:00
ZhangBiao 8307fbe7e1 【七界试炼】完成!!! 2021-09-17 19:57:45 +08:00
ZhangBiao 949d159010 【七界试炼】提交 2021-09-17 19:29:58 +08:00
ZhangBiao 6c17058b8e 【寻宝迷踪】活动结束跳回还弹出奖励修改 2021-09-16 17:45:14 +08:00
ZhangBiao 512a12cc72 【七界试炼】提交 2021-09-16 11:24:35 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
ZhangBiao c68496654f 【七界试炼】遗物 2021-09-13 13:54:58 +08:00
ZhangBiao 8c9f31f028 【七界试炼】遗物 2021-09-13 11:42:14 +08:00
ZhangBiao 1fefbb43e6 【七界试炼】提交 2021-09-09 11:10:43 +08:00
ZhangBiao b05227f79e 【七界试炼】提交 2021-09-08 17:32:48 +08:00
ZhangBiao 2fe984719b 【七界试炼】遗物1/2 2021-09-08 16:26:40 +08:00
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna ad9e76bda5 四灵试炼修改提交 2021-08-31 19:03:29 +08:00
jiaoyangna 82b992c4ca 我的助战报错修改提交 2021-08-31 17:12:30 +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
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +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
ZhangBiao 30afec1613 【寻宝迷踪】预设冲突重新提交 2021-08-18 13:43:44 +08:00