gaoxin
							
						 | 
						
							
							
							
							
								
							
								f29b6518fa
								
							
								
							
						 | 
						
							
							
								
								【协议】误删恢复
							
							
							
							
							
						 | 
						
							2020-12-26 20:27:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bf6fd2d13d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2020-12-26 20:22:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6945cbcacf
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】红点修改
							
							
							
							
							
						 | 
						
							2020-12-25 12:05:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3516c10cc6
								
							
								
							
						 | 
						
							
							
								
								[森罗环境] 扎小怪计入击杀奖励
							
							
							
							
							
						 | 
						
							2020-12-24 17:16:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e40364082c
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua 
							
						 | 
						
							2020-12-23 11:21:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								30f8049ef5
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2020-12-23 11:13:48 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f7f0d4099f
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】结束
							
							
							
							
							
						 | 
						
							2020-12-23 10:34:47 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								fa24af770b
								
							
								
							
						 | 
						
							
							
								
								【协议】战斗协议添加id字段
							
							
							
							
							
						 | 
						
							2020-12-18 19:38:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								79f6090afb
								
							
								
							
						 | 
						
							
							
								
								【协议】回滚系统消息item字段类型
							
							
							
							
							
						 | 
						
							2020-12-18 18:22:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ef1ced3ef7
								
							
								
							
						 | 
						
							
							
								
								【战报系统】基础功能添加
							
							
							
							
							
						 | 
						
							2020-12-18 16:51:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4c73219b39
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】诸多bug 修复
							
							
							
							
							
						 | 
						
							2020-12-12 18:00:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								86d190572a
								
							
								
							
						 | 
						
							
							
								
								【神将来袭】加战斗了
							
							
							
							
							
						 | 
						
							2020-12-02 17:14:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d0cb62fab6
								
							
								
							
						 | 
						
							
							
								
								【背包】物品最大数量限制提示添加
							
							
							
							
							
						 | 
						
							2020-11-27 13:31:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								80c949c54d
								
							
								
							
						 | 
						
							
							
								
								【灵兽】 灵兽数据分页
							
							
							
							
							
						 | 
						
							2020-11-27 10:57:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								de32379f8e
								
							
								
							
						 | 
						
							
							
								
								【竞技场】竞技场增加输赢奖励
							
							
							
							
							
						 | 
						
							2020-11-07 18:52:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8a5d51e2a3
								
							
								
							
						 | 
						
							
							
								
								【灵兽抽卡】增加可选灵兽
							
							
							
							
							
							
							
							(cherry picked from commit 8185be7c27) 
							
						 | 
						
							2020-11-13 12:12:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0a772f466b
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-06 20:36:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a6904526d3
								
							
								
							
						 | 
						
							
							
								
								协议提交
							
							
							
							
							
						 | 
						
							2020-11-06 17:26:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								41f62176f2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 17:19:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fe9b73aa0b
								
							
								
							
						 | 
						
							
							
								
								协议提交
							
							
							
							
							
						 | 
						
							2020-11-06 17:19:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								aa2db3e25e
								
							
								
							
						 | 
						
							
							
								
								【大闹天宫】 节点boss 站位错误 修复
							
							
							
							
							
						 | 
						
							2020-11-06 16:51:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5e130a7585
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2020-11-06 16:17:12 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1123b38709
								
							
								
							
						 | 
						
							
							
								
								协议提交
							
							
							
							
							
						 | 
						
							2020-11-06 13:31:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e2fae0cc52
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-06 09:37:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6f75850ae4
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】提交
							
							
							
							
							
						 | 
						
							2020-11-05 19:10:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b18b4cfd58
								
							
								
							
						 | 
						
							
							
								
								【皮肤】协议提交
							
							
							
							
							
						 | 
						
							2020-11-04 13:52:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								509357e333
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/皮肤
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua 
							
						 | 
						
							2020-11-04 10:54:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e92e63444b
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-03 17:27:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f79499faea
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】开始获取活动数据
							
							
							
							
							
						 | 
						
							2020-11-03 09:58:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3479bd153c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 合并 功能ok 但是战斗合完进不去
							
							
							
							
							
						 | 
						
							2020-10-31 17:01:46 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								ec3defb2c4
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】首通奖励协议提交
							
							
							
							
							
						 | 
						
							2020-10-30 11:03:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a2a870f421
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】提交4
							
							
							
							
							
						 | 
						
							2020-10-24 18:41:21 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								131d1aab1b
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】红点和帮助弹窗提交
							
							
							
							
							
						 | 
						
							2020-10-19 21:39:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								364c9c99fc
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】功能合并到local分支
							
							
							
							
							
						 | 
						
							2020-10-19 20:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								907d092c04
								
							
								
							
						 | 
						
							
							
								
								遗漏同步提交
							
							
							
							
							
						 | 
						
							2020-09-27 18:27:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fa3003fdc6
								
							
								
							
						 | 
						
							
							
								
								云梦祈福修改提交
							
							
							
							
							
						 | 
						
							2020-08-27 19:28:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								021a7dc5a7
								
							
								
							
						 | 
						
							
							
								
								森罗换层卡死问题修复
							
							
							
							
							
						 | 
						
							2020-08-27 18:15:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d51276f132
								
							
								
							
						 | 
						
							
							
								
								公会副本提交
							
							
							
							
							
						 | 
						
							2020-08-26 15:10:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e1b223e83f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx 
							
						 | 
						
							2020-08-22 13:59:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0759809be9
								
							
								
							
						 | 
						
							
							
								
								公会副本提交
							
							
							
							
							
						 | 
						
							2020-08-21 18:22:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b725617a8d
								
							
								
							
						 | 
						
							
							
								
								公会副本提交
							
							
							
							
							
						 | 
						
							2020-08-21 15:52:49 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c08c537b16
								
							
								
							
						 | 
						
							
							
								
								公会副本提交
							
							
							
							
							
						 | 
						
							2020-08-20 20:05:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								869481a2cd
								
							
								
							
						 | 
						
							
							
								
								公会副本部分提交
							
							
							
							
							
						 | 
						
							2020-08-19 17:28:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c9cb029494
								
							
								
							
						 | 
						
							
							
								
								无尽副本基本功能
							
							
							
							
							
							
							
							(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794) 
							
						 | 
						
							2020-08-18 10:49:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e2589d5301
								
							
								
							
						 | 
						
							
							
								
								提交打出的协议
							
							
							
							
							
							
							
							(cherry picked from commit fe559cc210441192ba638b19d43749de5207c99e) 
							
						 | 
						
							2020-08-18 10:45:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								058b18bc6f
								
							
								
							
						 | 
						
							
							
								
								最新表  协议数据
							
							
							
							
							
						 | 
						
							2020-08-12 18:29:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d5c241208d
								
							
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							2020-08-12 14:25:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								95dff6f0e9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop2' into xuanyuanbaojing
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2020-08-12 14:20:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c1c013a007
								
							
								
							
						 | 
						
							
							
								
								神将置换 基本功能完成
							
							
							
							
							
						 | 
						
							2020-08-11 20:55:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cea8d854f9
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2020-08-11 14:28:15 +08:00 |