Commit Graph

7512 Commits (4a9792363de021ea37db57e6a36ff08b6e5bc3bd)

Author SHA1 Message Date
jiaoyangna 4a9792363d 协议提交 2021-12-27 17:13:54 +08:00
jiaoyangna d83373ecab Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
2021-12-27 17:00:14 +08:00
jiaoyangna b3c0ea78ab 探索提交 2021-12-27 16:31:38 +08:00
jiaoyangna 9e47928008 探索提交 2021-12-27 16:16:56 +08:00
jiaoyangna bef8340c7c 探索 2021-12-27 15:48:09 +08:00
jiaoyangna 71496d3905 探索提交 2021-12-27 15:42:52 +08:00
wangzhenxing 07a90b7279 [战斗]=========战斗记录老虎上无敌盾记录修改 2021-12-27 15:42:38 +08:00
gaoxin 220bfff064 【优化】魂印描述优化 2021-12-30 00:54:40 +08:00
jiaoyangna b9a86b402c 探索提交 2021-12-27 14:53:55 +08:00
gaoxin dc431e3f4d 【首充收缩框】需要每次登陆后展开,当前是打开主城时展开 2021-12-27 12:05:43 +08:00
gaoxin 89f8af19c4 【主城】竖条改为初始打开 2021-12-31 01:53:05 +08:00
jiaoyangna 5f9f7da264 探索提交 2021-12-24 17:49:54 +08:00
jiaoyangna 577752e71d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 16:31:41 +08:00
jiaoyangna 65dbdc5283 【ID1019454】
【魂印】替换魂印时不刷新界面,需要重新进入才能看到替换后的魂印
2021-12-24 16:31:25 +08:00
wangzhenxing d3253c5edb 【战斗】========技能释放逻辑修改,技能播放技能攻击动作 2021-12-24 16:11:53 +08:00
wangzhenxing b07d5548e6 [功能]========坐骑界面选中状态修改 2021-12-24 15:45:04 +08:00
wangzhenxing ca17383879 Merge branch 'china/dev' into china/dev_res 2021-12-24 14:55:22 +08:00
ZhangBiao a28021b4f6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:47:52 +08:00
ZhangBiao 80b6315905 【降妖夺宝】在活动页面,进入珍奇宝阁购买野球拳,足够10连抽时,10连按钮依然显示妖晶抽取 2021-12-24 14:47:39 +08:00
jiaoyangna b33bd02c7f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:25:22 +08:00
gaoxin 9965f8e079 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-30 23:29:11 +08:00
gaoxin 9c22dfc990 【提审】不再显示充值竖条,也不再触发相关引导 2021-12-30 23:28:55 +08:00
ZhangBiao fea92ffabc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:20:06 +08:00
jiaoyangna 36ec134505 玉帝获取途径跳转提交 2021-12-24 14:20:06 +08:00
ZhangBiao 99d00e88e2 【命格】合成界面第一次打开道具详情 2021-12-24 14:19:47 +08:00
jiaoyangna 21e5b0846b 玉帝跳转提交 2021-12-24 14:13:39 +08:00
jiaoyangna 88130ac4dd 探索提交 2021-12-24 14:09:48 +08:00
wangzhenxing 6e2b1c1a17 [战斗]=======被动56 被动368修改 2021-12-24 14:00:51 +08:00
gaoxin e901bd9d3b 【轩辕宝镜】通关到最后一层,打开界面时列表位置没有固定在最新关 2021-12-30 22:37:35 +08:00
gaoxin d10d2f976a 【装备合成】添加输入改变合成数量的功能 2021-12-30 22:19:09 +08:00
gaoxin 613380a99f 【装备合成】添加长按自动增加数量功能 2021-12-30 20:32:11 +08:00
jiaoyangna 7f0e684bc0 一键探索修改提交 2021-12-24 11:18:03 +08:00
jiaoyangna 00dc90f4bb 商店报错添加容错 2021-12-24 11:05:39 +08:00
jiaoyangna 89b5eae8ec 商店添加容错 2021-12-24 10:58:55 +08:00
jiaoyangna e34092f93d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 10:54:16 +08:00
jiaoyangna b1c5113c39 商店报错添加容错 2021-12-24 10:53:26 +08:00
jiaoyangna 708a4bdef9 探索提交 2021-12-24 09:37:31 +08:00
jiaoyangna 6dfafd7054 探索提交 2021-12-24 00:33:33 +08:00
jiaoyangna 130a75c8dd 探索提交 2021-12-24 00:14:32 +08:00
jiaoyangna 5d37c0d4d9 探索提交 2021-12-23 17:23:02 +08:00
ZhangBiao d06fdbbac6 【玲珑宝镜】玲珑商市跟随是否活动开启显示按钮 2021-12-23 17:19:27 +08:00
ZhangBiao 7f9726e006 【命格】提交 2021-12-23 16:39:37 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
wangzhenxing c895652ef1 [战斗]======被动412 修改 2021-12-23 15:18:44 +08:00
gaoxin 7ea4c7bc51 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-30 00:01:21 +08:00
gaoxin da2b205955 【挂机】添加新人商城入口 2021-12-30 00:01:14 +08:00
wangzhenxing 76d9e596b4 [战斗]======被动412 提交 2021-12-23 14:37:19 +08:00
jiaoyangna 83b5a04ac6 探索提交 2021-12-23 13:45:33 +08:00
jiaoyangna 39254af42e 探索提交 2021-12-23 13:45:05 +08:00
jiaoyangna 7bb3325c99 探索提交 2021-12-23 13:09:34 +08:00