| 
					
				 | 
			
			
				@@ -21,7 +21,7 @@ const Macro = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     cur_token: "cur_token",                 //当前用户token 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//业务逻辑层的NetMgr 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//登录及登录后网络业务逻辑  网络业务逻辑层的NetMgr 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export class LoginManager { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private _key = 'dd2edb87ea9eb7DFa32fd4IO0572ZX76d3a1fab861c1d5qishituan'; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -187,7 +187,9 @@ export class LoginManager { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (data.get_mails) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 MailData.setData(data.get_mails) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (data.role_bag && data.role_bag.roles) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                RoleData.setData(data.role_bag.roles) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (data.inverntory) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (data.inverntory.material) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     GoodsData.setAllGoods(data.inverntory.material) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -310,51 +312,49 @@ export class LoginManager { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         postData.back() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if (resp.data.role_bag && resp.data.role_bag.roles) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        RoleData.setData(resp.data.role_bag.roles) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if (resp.data.have_pay) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        if (!resp.data.pay_notify) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            this.sendPost('user', 'get_cash', (data) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if (data.code) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if (data.ext_pay_info) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    let awardsMsg = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    if (data.ext_pay_info.awards) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                        for (const i in data.ext_pay_info.awards) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                            awardsMsg.push(data.ext_pay_info.awards[i]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    if (awardsMsg.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                       // UserData.BackAwards(awardsMsg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    if (data.ext_pay_info.cash) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                        awardsMsg.push(['user', 'cash', data.ext_pay_info.cash]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    if (awardsMsg.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                        // Framework.layer.open(ViewID.Reward, null, awardsMsg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if (data.cash) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    UserData['status']['cash'] = data.cash; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                   // Framework.event.fireEvent(GameEvent.Property_Renew, 'cash') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if (data.month_card) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    UserData['activity']['month_card'] = data.month_card; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if (data.life_card) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    UserData['activity']['life_card'] = data.life_card; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if (data.fund) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    UserData['activity']['fund'] = data.fund; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                               // Framework.event.fireEvent(GameEvent.Recharge_Referesh); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            }, {}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    // if (resp.data.have_pay) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //     if (!resp.data.pay_notify) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //         this.sendPost('user', 'get_cash', (data) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             if (data.code) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             if (data.ext_pay_info) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 let awardsMsg = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 if (data.ext_pay_info.awards) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                     for (const i in data.ext_pay_info.awards) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                         awardsMsg.push(data.ext_pay_info.awards[i]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 if (awardsMsg.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                    // UserData.BackAwards(awardsMsg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 if (data.ext_pay_info.cash) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                     awardsMsg.push(['user', 'cash', data.ext_pay_info.cash]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 if (awardsMsg.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                     // Framework.layer.open(ViewID.Reward, null, awardsMsg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             if (data.cash) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 UserData['status']['cash'] = data.cash; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                // Framework.event.fireEvent(GameEvent.Property_Renew, 'cash') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             if (data.month_card) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 UserData['activity']['month_card'] = data.month_card; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             if (data.life_card) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 UserData['activity']['life_card'] = data.life_card; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             if (data.fund) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //                 UserData['activity']['fund'] = data.fund; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //            // Framework.event.fireEvent(GameEvent.Recharge_Referesh); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //         }, {}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     nextPostTask && nextPostTask(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if (postData.act == 'auto_open') { 
			 |