Commit Graph

149 Commits (574d95b607b42da37f4e9c43c613979d4cd0d2b3)

Author SHA1 Message Date
zhangqiang ffed262485 【bug】 2021-05-28 13:48:43 +08:00
zhangqiang fe6b69bfe6 【bug】提交 2021-05-28 10:32:42 +08:00
ZhangBiao 4b54176492 【协议提交】 2021-05-27 20:08:32 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
ZhangBiao 905e66c471 【公会援助】名字颜色提交 2021-05-27 16:43:59 +08:00
ZhangBiao e242e08b01 【名字颜色修改】 2021-05-26 17:03:42 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
zhangqiang fcc00ee1d7 【心魔试炼】提交 2021-05-25 20:50:23 +08:00
zhangqiang a1c4a6aa5c 【心魔】 + 山河社稷图修改 2021-05-25 14:51:26 +08:00
jiaoyangna 6e90a19270 协议提交 2021-05-24 15:02:57 +08:00
jiaoyangna c68da98b84 Merge branch 'china/dev-c' into 0优化/无尽副本 2021-05-24 14:43:42 +08:00
wangzhenxing 769042a739 master_test_gn协议提交 2021-05-24 14:14:11 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.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/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
zhangqiang 80183cd5a0 【特权加等级奖励】1 2021-05-20 14:18:48 +08:00
ZhangBiao be1085d2bb Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
2021-05-19 20:01:57 +08:00
zhangqiang d36dfd9e25 【山河社稷图】是否通关 2021-05-18 16:51:43 +08:00
ZhangBiao 93b8746cfe 【修行】玩家信息界面神印提交 2021-05-18 14:59:47 +08:00
zhangqiang 32eace4be7 【山河社稷图】一键上阵修改 2021-05-17 19:34:23 +08:00
ZhangBiao 0fa0f251ba 【修行】巅峰赛名字颜色修改 2021-05-17 17:42:08 +08:00
ZhangBiao 8e1b42c0ac 【修行】名字颜色修改 2021-05-17 17:28:37 +08:00
ZhangBiao 10481bc650 【修行】名字颜色修改 2021-05-17 14:15:55 +08:00
zhangqiang 810139a324 【协议合并提交】刷资源提交 2021-05-17 11:28:54 +08:00
zhangqiang e763e54799 Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.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/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-05-17 11:04:01 +08:00
jiaoyangna d62b8b5011 无尽副本修改提交 2021-05-14 19:11:40 +08:00
ZhangBiao 87f18cb049 【修行】提交 2021-05-14 17:48:47 +08:00
zhangqiang 364ce0526b 【山河社稷图】提交 2021-05-13 22:50:34 +08:00
ZhangBiao 8df2338780 【修行】提交 2021-05-13 17:37:47 +08:00
zhangqiang da33b98dfb 【山河社稷图】提交 2021-05-13 09:56:11 +08:00
ZhangBiao b6854deccd 【修行】协议提交 2021-05-12 18:47:47 +08:00
zhangqiang effe90990f 【山河社稷图】提交 2021-05-11 15:12:37 +08:00
zhangqiang 9f69ba9d7c 【新的协议】 2021-04-27 16:23:25 +08:00
ZhangBiao 2770e6da31 Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-04-26 17:18:02 +08:00
zhangqiang b4ed183fc6 【前端拍脸修改】提交——1 2021-04-26 13:44:31 +08:00
ZhangBiao 39329ce5cc 【踏碎凌霄提交】 2021-04-25 15:07:36 +08:00
ZhangBiao 1f9c73e6ed 【踏碎凌霄】 2021-04-23 17:59:56 +08:00
ZhangBiao 325421e04c 【踏碎凌霄】提交 2021-04-23 17:56:57 +08:00
zhangqiang 9706cd776d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-19 13:46:34 +08:00
zhangqiang de76c697c4 【英雄升星祭品】提交——01 2021-04-19 13:46:24 +08:00
ZhangBiao 034d0846c5 【森罗幻境】提交 2021-04-17 17:12:24 +08:00
ZhangBiao d5879c2445 【森罗幻境】暂时还原 2021-04-15 14:24:40 +08:00
ZhangBiao 5d47d0b42e 【森罗】排序,选择相同将,修复 2021-04-15 12:26:47 +08:00
gaoxin 839a9e4d1d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 17:03:11 +08:00
wangzhenxing 443ba942cf [功能]================称号功能提交 2021-04-12 16:23:57 +08:00
zhangqiang 8ab2496c28 【邮件】增加协议 点击邮件再获取内容 2021-04-10 15:37:10 +08:00
ZhangBiao 685ace078a 【福星高照】增加协议 2021-03-30 18:50:15 +08:00
gaoxin c8327cbb92 【森罗幻境】临时修改数据类型不统一导致战斗报错的问题 2021-03-25 10:43:53 +08:00
zhangqiang a56d71c4f8 【公会副本】bug修改 2021-03-23 15:25:00 +08:00
gaoxin 7e0e5e198a 【sdk】添加上传支付订单id的接口 2021-03-20 22:12:51 +08:00
gaoxin 99e373bda2 【协议】修复登录成功确认协议丢失 2021-03-05 14:53:03 +08:00