Commit Graph

562 Commits (a6652757b1d67a1ed947e8f1ecd67f1aea76986d)

Author SHA1 Message Date
jiaoyangna b40bd10a32 主城修改提交 2021-12-28 15:07:42 +08:00
jiaoyangna b256c7a9c5 探索提交 2021-12-28 14:50:45 +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 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
gaoxin 9c22dfc990 【提审】不再显示充值竖条,也不再触发相关引导 2021-12-30 23:28:55 +08:00
jiaoyangna 5d37c0d4d9 探索提交 2021-12-23 17:23:02 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
ZhangBiao e6aa1d31fe Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
2021-12-23 09:43:06 +08:00
jiaoyangna d2271d89b6 探索提交 2021-12-22 12:07:00 +08:00
gaoxin 9a1350e8d3 【超值基金】语法错误 2021-12-21 18:27:15 +08:00
jiaoyangna 89fdc69afd 添加拍脸提交 2021-12-21 17:21:10 +08:00
ZhangBiao d189833b3f 【超值基金】提交 2021-12-21 11:35:56 +08:00
jiaoyangna 2c2d6a5e56 添加竞技试炼提交 2021-12-20 22:11:33 +08:00
jiaoyangna c6f99b2eab 竞技试炼修改提交 2021-12-20 22:05:18 +08:00
jiaoyangna b60d319083 竞技试炼修改提交 2021-12-20 22:03:08 +08:00
jiaoyangna a19e1d1b7d 返回主城打开竞技试炼 2021-12-20 21:59:33 +08:00
ZhangBiao 745a9d1dae Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-20 14:07:56 +08:00
jiaoyangna ffd7d0ecbe 超值返利修改提交 2021-12-17 16:41:08 +08:00
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
jiaoyangna 50927b9ac5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 16:55:46 +08:00
jiaoyangna 1ae167efb5 至尊降世修改提交 2021-12-16 16:55:30 +08:00
gaoxin 969a22a768 【引导】修改引导天书密卷时主城场景的位置 2021-12-26 15:08:51 +08:00
jiaoyangna 11c4f914b5 至尊降世提交 2021-12-16 11:42:00 +08:00
ZhangBiao ad71840333 【GM】增加删除操作 2021-12-14 15:01:39 +08:00
ZhangBiao f09556242d Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-12-10 14:16:28 +08:00
jiaoyangna e33181dddb 招募秘宝提交 2021-12-10 13:41:03 +08:00
ZhangBiao be16abf79a Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-12-08 14:18:38 +08:00
jiaoyangna 9b1ca0135c 【ID1010829】
增加开服竞技比拼活动——竞技试炼
2021-12-08 14:03:23 +08:00
ZhangBiao 3ad898f8af 【命格】提交 2021-12-07 11:50:03 +08:00
ZhangBiao bc69e64b81 【连购礼包】提交 2021-12-02 16:27:24 +08:00
gaoxin 28538e89b0 【GM】添加剧情测试的GM 2021-12-02 01:13:52 +08:00
jiaoyangna 0d18d4595e 测试按钮关闭 2021-11-26 13:05:07 +08:00
jiaoyangna 2212df06ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:39:24 +08:00
jiaoyangna b78e2335fa 身外化身提交 2021-11-26 11:34:25 +08:00
jiaoyangna fd22b5a87f 天地洪炉提交 2021-11-25 18:55:20 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
jiaoyangna 735b2dc404 法宝之灵展示修改 2021-11-23 14:00:36 +08:00
ZhangBiao ab4faba301 【灵脉秘境】主动攻击不会产生红点 2021-11-22 16:11:21 +08:00
ZhangBiao 2428034e9d 【GM】增加一键法宝碎片 2021-11-22 15:00:46 +08:00
ZhangBiao 58d7a71faf 【灵脉秘境】提交 2021-11-18 15:14:39 +08:00
ZhangBiao 8125ed131e 【灵脉秘境】提交 2021-11-18 13:17:28 +08:00
ZhangBiao 6012b533ca 【灵脉秘境】提交 2021-11-16 17:34:37 +08:00
ZhangBiao 5eaf88defb 【GM】修改GM 2021-11-16 11:53:19 +08:00
gaoxin 89162f6294 【GM】优化快速战斗结果显示 2021-11-02 13:31:13 +08:00
gaoxin 2b9457139b 【GM】添加快速战斗GM 2021-11-02 10:55:50 +08:00
gaoxin b181f4bd55 【GM】添加一些GM命令 2021-10-29 12:08:40 +08:00
ZhangBiao 3b42cd525e 【三界降魔】新活动完成 2021-10-27 18:08:16 +08:00
gaoxin 7a5f41ef46 【积天豪礼】分离到主城 2021-11-10 00:58:39 +08:00