ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8a5d51e2a3
								
							
								
							
						 | 
						
							
							
								
								【灵兽抽卡】增加可选灵兽
							
							
							
							
							
							
							
							(cherry picked from commit 8185be7c27) 
							
						 | 
						
							2020-11-13 12:12:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e9d984b329
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/神将觉醒
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2020-11-12 19:34:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2563c6bdd6
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】货币显示修复
							
							
							
							
							
						 | 
						
							2020-11-12 18:17:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2c143deea9
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua 
							
						 | 
						
							2020-11-12 17:21:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a5c36cf58a
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】未开启更换灵兽版本
							
							
							
							
							
						 | 
						
							2020-11-12 17:11:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a6483b3181
								
							
								
							
						 | 
						
							
							
								
								[灵兽特惠] 提交
							
							
							
							
							
						 | 
						
							2020-11-12 11:31:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1ba753044f
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】抽卡逻辑完善了
							
							
							
							
							
						 | 
						
							2020-11-11 16:53:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								629eb98f1b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/神将觉醒
							
							
							
							
							
						 | 
						
							2020-11-11 11:37:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								48e6d33b7b
								
							
								
							
						 | 
						
							
							
								
								【神将觉醒】 效果图 资源 提交
							
							
							
							
							
						 | 
						
							2020-11-10 17:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8ef89acdde
								
							
								
							
						 | 
						
							
							
								
								【bug】修复部分界面文字显示错误的问题
							
							
							
							
							
						 | 
						
							2020-11-10 10:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6a1693939c
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 觉醒添加图鉴
							
							
							
							
							
						 | 
						
							2020-11-09 20:05:51 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bd6e61d92a
								
							
								
							
						 | 
						
							
							
								
								【语言工具】添加代码语言还原工具
							
							
							
							
							
						 | 
						
							2020-11-07 15:42:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								22038419b7
								
							
								
							
						 | 
						
							
							
								
								神医天降提交
							
							
							
							
							
						 | 
						
							2020-11-06 19:54:00 +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 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b516a8c202
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】没有QA 无法购买
							
							
							
							
							
						 | 
						
							2020-11-06 13:36:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e2fae0cc52
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-06 09:37:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6f75850ae4
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】提交
							
							
							
							
							
						 | 
						
							2020-11-05 19:10:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								476057bd1c
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】主界面奖励显示 通用奖励界面创建
							
							
							
							
							
						 | 
						
							2020-11-04 19:51:58 +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 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5d40b102dc
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】添加type 拼数据
							
							
							
							
							
						 | 
						
							2020-11-03 19:01:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e92e63444b
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-03 17:27:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f79499faea
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】开始获取活动数据
							
							
							
							
							
						 | 
						
							2020-11-03 09:58:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d00d3e803c
								
							
								
							
						 | 
						
							
							
								
								【商店】删除商店的动画显示
							
							
							
							
							
						 | 
						
							2020-11-03 01:00:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								34b4b5db51
								
							
								
							
						 | 
						
							
							
								
								【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题
							
							
							
							
							
						 | 
						
							2020-11-02 22:55:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8640018b87
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】开坑 搭界面 和做动画
							
							
							
							
							
						 | 
						
							2020-11-02 18:05:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3bbaab27be
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序
							
							
							
							
							
						 | 
						
							2020-11-02 14:36:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3479bd153c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 合并 功能ok 但是战斗合完进不去
							
							
							
							
							
						 | 
						
							2020-10-31 17:01:46 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								0752b7694e
								
							
								
							
						 | 
						
							
							
								
								【排行榜】  排行榜显示
							
							
							
							
							
						 | 
						
							2020-10-27 16:23:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6407abc8c9
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】提交8 漏题补
							
							
							
							
							
						 | 
						
							2020-10-26 11:53:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c12c63bdaf
								
							
								
							
						 | 
						
							
							
								
								【language表】修复战斗中会出现错误文字  “抢夺成功,获得%s积分!”  的问题
							
							
							
							
							
						 | 
						
							2020-10-26 11:21:40 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								43a370f5a8
								
							
								
							
						 | 
						
							
							
								
								报错提交
							
							
							
							
							
						 | 
						
							2020-10-26 10:56:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2a0d59849c
								
							
								
							
						 | 
						
							
							
								
								【设计大典】提交7
							
							
							
							
							
						 | 
						
							2020-10-24 19:02:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0bf6e05add
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】提交6
							
							
							
							
							
						 | 
						
							2020-10-24 18:58:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a2a870f421
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】提交4
							
							
							
							
							
						 | 
						
							2020-10-24 18:41:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0349671074
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】提交2
							
							
							
							
							
						 | 
						
							2020-10-24 18:23:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								589e535e73
								
							
								
							
						 | 
						
							
							
								
								generalpopup commit
							
							
							
							
							
						 | 
						
							2020-10-19 23:18:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f53a566ce8
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】功能入口随功能开启添加
							
							
							
							
							
						 | 
						
							2020-10-19 22:57:02 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								131d1aab1b
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】红点和帮助弹窗提交
							
							
							
							
							
						 | 
						
							2020-10-19 21:39:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								364c9c99fc
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】功能合并到local分支
							
							
							
							
							
						 | 
						
							2020-10-19 20:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f0e9063c97
								
							
								
							
						 | 
						
							
							
								
								关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
							
							
							
							
							
						 | 
						
							2020-10-16 17:56:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d2792bdb8b
								
							
								
							
						 | 
						
							
							
								
								线上活动 森罗幻境达人前端修改2
							
							
							
							
							
						 | 
						
							2020-10-12 14:47:02 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f2d3f045aa
								
							
								
							
						 | 
						
							
							
								
								森罗幻境提交1
							
							
							
							
							
						 | 
						
							2020-10-12 14:46:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a697e38584
								
							
								
							
						 | 
						
							
							
								
								修改为正式服
							
							
							
							
							
						 | 
						
							2020-09-30 11:15:56 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								bd5d9da3bf
								
							
								
							
						 | 
						
							
							
								
								部分功能通过判断提审服和正式服进行开启和关闭
							
							
							
							
							
						 | 
						
							2020-09-30 11:14:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								75a8cade8b
								
							
								
							
						 | 
						
							
							
								
								默认头像修改
							
							
							
							
							
						 | 
						
							2020-09-28 17:35:34 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								783c61eed8
								
							
								
							
						 | 
						
							
							
								
								修复新玩家登陆卡在登陆100%
							
							
							
							
							
						 | 
						
							2020-09-27 20:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								673070438b
								
							
								
							
						 | 
						
							
							
								
								头像默认显示复原
							
							
							
							
							
						 | 
						
							2020-09-27 19:05:09 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								907d092c04
								
							
								
							
						 | 
						
							
							
								
								遗漏同步提交
							
							
							
							
							
						 | 
						
							2020-09-27 18:27:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b3d15c1945
								
							
								
							
						 | 
						
							
							
								
								头像特效添加
							
							
							
							
							
						 | 
						
							2020-09-27 16:58:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								97f9b8f671
								
							
								
							
						 | 
						
							
							
								
								遴选三界除魔
							
							
							
							
							
						 | 
						
							2020-09-27 16:44:31 +08:00 |